A lot calls saved, expression language rewritten:

[mailer.git] / inc / load_config.php

diff --git a/inc/load_config.php b/inc/load_config.php
index fce7ca86967a46abc9bd8818c3728bcda1f78e88..266eca12cecc70837bf7b13db55ad8505dd7473c 100644 (file)
--- a/inc/load_config.php
+++ b/inc/load_config.php
@@ -51,7 +51,7 @@ setConfigEntry('_DB_TYPE'    , 'mysql3');
 $GLOBALS['config_local_loaded'] = false;
 
 // Is the local configuration there?
-if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncludeReadable('inc/config.php'))) {
+if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadable('inc/config.php'))) {
        // We are better in installation mode
        $GLOBALS['mailer_installing'] = true;
 
@@ -62,10 +62,10 @@ if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncl
        setConfigEntry('OUTPUT_MODE', 'render');
 
        // Both exist! This is bad and should be avoided by the admin
-       debug_report_bug(__FILE__, __LINE__, 'You have uploaded or kept an out-dated file at <strong>inc/config.php</strong> along with the new file <strong>'.getConfig('CACHE_PATH').'config-local.php</strong>. Please remove <strong>inc/config.php</strong> to avoid incompatiblity issues. Thank you.');
-} elseif (isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) {
+       debug_report_bug(__FILE__, __LINE__, 'You have uploaded or kept an out-dated file at <strong>inc/config.php</strong> along with the new file <strong>'.getCachePath().'config-local.php</strong>. Please remove <strong>inc/config.php</strong> to avoid incompatiblity issues. Thank you.');
+} elseif (isIncludeReadable(getCachePath() . 'config-local.php')) {
        // Then load it
-       loadIncludeOnce(getConfig('CACHE_PATH') . 'config-local.php');
+       loadIncludeOnce(getCachePath() . 'config-local.php');
 
        // Mark configuration as loaded
        $GLOBALS['config_local_loaded'] = true;