Fix for DEFAULT_SALT_LENGTH

diff --git a/inc/config-functions.php b/inc/config-functions.php
index d7c27d8171a65696ae5ae151aca6efafe120b31c..02563b99353adeba374ca1750f7086d2133604b5 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -60,6 +60,7 @@ function initConfig () {
                'ADMIN_REGISTERED'    => 'N',
                'MXCHANGE_INSTALLED'  => 'N',
                'DEFAULT_LANG'        => 'de',
+               'DEFAULT_SALT_LENGTH' => 40,
                'DEBUG_MODE'          => 'N',
                'DEBUG_RESET'         => 'N',
                'DEBUG_MONTHLY'       => 'N',

diff --git a/inc/filters.php b/inc/filters.php
index 1b26cddabb587c8d6bdbb2372242e0cbc950aad2..2aed78b9455016de30a73928b1ecb5d9347aa451 100644 (file)
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -442,9 +442,15 @@ function FILTER_COMPILE_CONFIG ($code) {
                                if (isConfigEntrySet($matches[1][$key])) {
                                        // Set it for caching
                                        $GLOBALS['compile_config'][$matches[1][$key]] = getConfig($matches[1][$key]);
-                               } else {
+                               } elseif (isConfigEntrySet('default_' . strtoupper($matches[1][$key]))) {
+                                       // Use default value
+                                       $GLOBALS['compile_config'][$matches[1][$key]] = getConfig('DEFAULT_' . strtoupper($matches[1][$key]));
+                               } elseif (isMessageIdValid('DEFAULT_' . strtoupper($matches[1][$key]))) {
                                        // No config, try the language system
                                        $GLOBALS['compile_config'][$matches[1][$key]] = getMessage('DEFAULT_' . strtoupper($matches[1][$key]));
+                               } else {
+                                       // Unhandled!
+                                       $GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!';
                                }
                        } // END - if