From 6bcd8d74db28169e725e11e9499c93170ca2e107 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 30 Oct 2009 09:34:24 +0000
Subject: [PATCH] More fixes for merging config
---
inc/config-functions.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/inc/config-functions.php b/inc/config-functions.php
index bb8e9696fd..4d873332c9 100644
--- 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
- 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
- $return = null;
+ $return = array();
// Is the config set?
- if (isConfigurationLoaded()) {
+ if (isset($GLOABLS['config'])) {
// 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
- $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?
--
2.39.5