projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 4651b6c)
Merge pull request #901 from dlobo/CRM-12674
authordlobo <lobo@civicrm.org>
Wed, 29 May 2013 16:15:15 +0000 (09:15 -0700)
committerdlobo <lobo@civicrm.org>
Wed, 29 May 2013 16:15:15 +0000 (09:15 -0700)
CRM-12674

CRM/Core/BAO/ConfigSetting.php patch | blob | blame | history

diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php
index 7882796e2c10524bb60fb6443f2f74ae972c2fd3..cddcd7a74518bc611b203bb34af96ada3c1cb607 100644 (file)
--- a/CRM/Core/BAO/ConfigSetting.php
+++ b/CRM/Core/BAO/ConfigSetting.php
@@ -462,7 +462,7 @@ class CRM_Core_BAO_ConfigSetting {
       $config->templateCompileDir
     );
 
-    if ($config->userFramework->is_drupal) {
+    if ($config->userSystem->is_drupal) {
       $matches = array();
       if (preg_match(
           '|/sites/([\w\.\-\_]+)/|',