More fixes for merging config

diff --git a/inc/config-functions.php b/inc/config-functions.php
index bb8e9696fdbbe9056216cfe08b2b1e5747e302e4..4d873332c9101293ec4f77447df3581c4d396105 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -118,16 +118,16 @@ function incrementConfigEntry ($configEntry, $value=1) {
 // Checks wether the configuration array is set so the config is loaded
 function isConfigurationLoaded () {
        // Check all
 // Checks wether the configuration array is set so the config is loaded
 function isConfigurationLoaded () {
        // Check all

-       return ((isset($GLOBALS['config'])) && (is_array($GLOBALS['config'])) && (count($GLOBALS['config']) > 0));
+       return (isset($GLOBALS['config']['config']));

 }
 
 // Getter for whole $GLOBALS['config'] array
 function getConfigArray () {
        // Default is null
 }
 
 // Getter for whole $GLOBALS['config'] array
 function getConfigArray () {
        // Default is null

-       $return = null;
+       $return = array();

 
        // Is the config set?
 
        // Is the config set?

-       if (isConfigurationLoaded()) {
+       if (isset($GLOABLS['config'])) {

                // Then use it
                $return = $GLOBALS['config'];
        } // END - if
                // Then use it
                $return = $GLOBALS['config'];
        } // END - if


@@ -350,7 +350,7 @@ function FILTER_LOAD_CONFIGURATION ($no = 0) {
                } // END - if
        } elseif ((!isExtensionActive('cache')) || (!isset($GLOBALS['cache_array']['config'][$no]))) {
                // Load config from DB
                } // END - if
        } elseif ((!isExtensionActive('cache')) || (!isset($GLOBALS['cache_array']['config'][$no]))) {
                // Load config from DB

-               $result_config = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_config` WHERE config=%d LIMIT 1",
+               $result_config = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_config` WHERE `config`='%s' LIMIT 1",

                        array(bigintval($no)), __FUNCTION__, __LINE__);
 
                // Is the config there?
                        array(bigintval($no)), __FUNCTION__, __LINE__);
 
                // Is the config there?