Fix for DEFAULT_SALT_LENGTH
[mailer.git] / inc / filters.php
index 1b26cdd..2aed78b 100644 (file)
@@ -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