projects
/
mailer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9afd6ec
)
Final fix for non-working FILTER_LOAD_CONFIGURATION()
author
Roland Häder
<roland@mxchange.org>
Thu, 5 Nov 2009 15:23:22 +0000
(15:23 +0000)
committer
Roland Häder
<roland@mxchange.org>
Thu, 5 Nov 2009 15:23:22 +0000
(15:23 +0000)
inc/config-functions.php
patch
|
blob
|
history
diff --git
a/inc/config-functions.php
b/inc/config-functions.php
index 881b7f63d8c9359184542915cf0002cc2aeffa20..694a53eb639071f9f1010524ff658d073c899fa4 100644
(file)
--- a/
inc/config-functions.php
+++ b/
inc/config-functions.php
@@
-354,14
+354,13
@@
function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
// Filter for loading configuration
function FILTER_LOAD_CONFIGURATION ($no = '0') {
// Filter for loading configuration
function FILTER_LOAD_CONFIGURATION ($no = '0') {
+ // Is the value null, fix it :(
+ if (is_null($no)) $no = '0';
+
// Check for cache extension, cache-array and if the requested configuration is in cache
if ((isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) {
// Load config from cache
// Check for cache extension, cache-array and if the requested configuration is in cache
if ((isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) {
// Load config from cache
- //* DEBUG: */ outputHtml(gettype($GLOBALS['cache_array']['config'][$no])."<br />");
mergeConfig($GLOBALS['cache_array']['config'][$no]);
mergeConfig($GLOBALS['cache_array']['config'][$no]);
- //foreach ($GLOBALS['cache_array']['config'][$no] as $key => $value) {
- // setConfigEntry($key, $value);
- //} // END - foreach
// Count cache hits if exists
if ((isStatsEntrySet('cache_hits')) && (isExtensionActive('cache'))) {
// Count cache hits if exists
if ((isStatsEntrySet('cache_hits')) && (isExtensionActive('cache'))) {