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

kurund · kurund · commit 284ada8c0ed0 · 2013-05-23T21:58:46.000-07:00
CRM-12652
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';
