Merge pull request civicrm#28 from colemanw/4.4

CRM-13694 - Check if CIVICRM_SETTINGS_PATH already defined
f2boot · Nov 8, 2013 · 0214792 · 0214792
2 parents 12247df + ba93e4e
commit 0214792
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/civicrm.php b/civicrm.php
@@ -71,7 +71,9 @@
 
 // define commonly used items as constants
 define( 'CIVICRM_PLUGIN_DIR', plugin_dir_path(__FILE__) );
-define( 'CIVICRM_SETTINGS_PATH', CIVICRM_PLUGIN_DIR . 'civicrm.settings.php' );
+if (!defined('CIVICRM_SETTINGS_PATH')) {
+  define( 'CIVICRM_SETTINGS_PATH', CIVICRM_PLUGIN_DIR . 'civicrm.settings.php' );
+}
 
 // prevent CiviCRM from rendering its own header
 define( 'CIVICRM_UF_HEAD', TRUE );