Renamed isConfigLoaded() to isConfigurationLoaded()

diff --git a/inc/config-functions.php b/inc/config-functions.php
index f113996598da95cbae43db8d5558c09f7e943ebc..bb8e9696fdbbe9056216cfe08b2b1e5747e302e4 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 // Init the config array
 function initConfig () {
        // Init not if already found
-       if (isConfigLoaded()) {
+       if (isConfigurationLoaded()) {
                // Already initialized
                debug_report_bug(sprintf("[%s:%s] Configuration is already initialized.", __FUNCTION__, __LINE__));
        } // END - if
@@ -116,7 +116,7 @@ function incrementConfigEntry ($configEntry, $value=1) {
 }
 
 // Checks wether the configuration array is set so the config is loaded
-function isConfigLoaded () {
+function isConfigurationLoaded () {
        // Check all
        return ((isset($GLOBALS['config'])) && (is_array($GLOBALS['config'])) && (count($GLOBALS['config']) > 0));
 }
@@ -127,7 +127,7 @@ function getConfigArray () {
        $return = null;
 
        // Is the config set?
-       if (isConfigLoaded()) {
+       if (isConfigurationLoaded()) {
                // Then use it
                $return = $GLOBALS['config'];
        } // END - if

diff --git a/inc/functions.php b/inc/functions.php
index 620a4bbce0fe481ad3f9a2c4e3a09a2bc9799405..d5f455592107ffc037656fec0abf166309df75fd 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -3514,7 +3514,7 @@ function addSqlToDebug ($result, $sqlString, $timing, $F, $L) {
        // Do we have cache?
        if (!isset($GLOBALS['debug_sql_available'])) {
                // Check it and cache it in $GLOBALS
-               $GLOBALS['debug_sql_available'] = ((isExtensionInstalledAndNewer('other', '0.2.2')) && (getConfig('display_debug_sqls') == 'Y'));
+               $GLOBALS['debug_sql_available'] = ((isConfigurationLoaded()) && (isExtensionInstalledAndNewer('other', '0.2.2')) && (getConfig('display_debug_sqls') == 'Y'));
        } // END - if
        
        // Don't execute anything here if we don't need or ext-other is missing
@@ -3545,7 +3545,7 @@ function initCacheInstance () {
        $GLOBALS['cache_instance'] = new CacheSystem();
        if ($GLOBALS['cache_instance']->getStatus() != 'done') {
                // Failed to initialize cache sustem
-               addFatalMessage(__FILE__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".getMessage('CACHE_CANNOT_INITIALIZE'));
+               addFatalMessage(__FILE__, __LINE__, '(<font color="#0000aa">' . __LINE__ . '</font>): ' . getMessage('CACHE_CANNOT_INITIALIZE'));
        } // END - if
 }
 

diff --git a/inc/header.php b/inc/header.php
index 34feadb23c9e766ac0ce013d410a40996a8de436..06da594e4d73fb13348a091890ab0c79cfa5a232 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -48,7 +48,7 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
        // If not in CSS mode generate the header
        if (getOutputMode() != 1) {
                // Config and database connection valid?
-               if ((isConfigLocalLoaded()) && (isConfigLoaded()) && (SQL_IS_LINK_UP()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.6'))) {
+               if ((isConfigLocalLoaded()) && (isConfigurationLoaded()) && (SQL_IS_LINK_UP()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.6'))) {
                        // Init title
                        $TITLE = '';
 
@@ -94,7 +94,7 @@ if (($GLOBALS['header_sent'] != 1) && ($GLOBALS['header_sent'] != 2)) {
                        $content['header_title'] = getMessage('NO_CONFIG_FOUND_TITLE');
 
                        // Do not add the fatal message in installation mode
-                       if ((!isInstalling()) && (!isConfigLoaded())) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND'));
+                       if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FILE__, __LINE__, getMessage('NO_CONFIG_FOUND'));
                }
 
                // Save some little memory