projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ce12654)
Ensure that the folder matches the http_host
authorSeamus Lee <seamuslee001@gmail.com>
Mon, 21 Nov 2016 21:05:20 +0000 (08:05 +1100)
committerColeman Watts <coleman@civicrm.org>
Tue, 22 Nov 2016 03:55:36 +0000 (22:55 -0500)
CRM/Utils/System/DrupalBase.php patch | blob | blame | history

diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php
index e898b320020092dc8b71aeda7d83d2d7d9c69cb4..943ea51905247840453eab19211210a66a22bf69 100644 (file)
--- a/CRM/Utils/System/DrupalBase.php
+++ b/CRM/Utils/System/DrupalBase.php
@@ -646,7 +646,7 @@ abstract class CRM_Utils_System_DrupalBase extends CRM_Utils_System_Base {
         }
 
         //Check if files path exists...
-        if ($this->checkFilesExists($basepath, $folder)) {
+        if ($this->checkFilesExists($basepath, $folder) && $folder == $_SERVER['HTTP_HOST']) {
           $correct = $folder;
           break;
         }