Merge pull request civicrm#8 from dlobo/CRM-12652

CRM-12652
atif-shaikh · May 24, 2013 · 284ada8 · 284ada8
2 parents 5319c3b + dca3682
commit 284ada8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/admin/helpers/api.php b/admin/helpers/api.php
@@ -14,7 +14,9 @@
 jimport('joomla.application.component.helper');
 class CivicrmHelperApi {
   function civiInit() {
-    define('CIVICRM_SETTINGS_PATH', JPATH_BASE . DS . 'administrator' . DS . 'components' . DS . 'com_civicrm' . DS . 'civicrm.settings.php');
+    if (!defined('CIVICRM_SETTINGS_PATH')) {
+      define('CIVICRM_SETTINGS_PATH', JPATH_BASE . '/components/com_civicrm/civicrm.settings.php');
+    }
     require_once CIVICRM_SETTINGS_PATH;
 
     require_once 'CRM/Core/Config.php';