Yet another wrapper function 'cached'

diff --git a/inc/functions.php b/inc/functions.php
index d45f5e56635e8264500e9b46141df30a95f08b29..9a1f4e1cd983c53720e2a7e750e64d7be57ac55e 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2721,11 +2721,12 @@ function isUrlValidSimple ($url) {
        $pattern['d1g12']  = $http . $domain1 . $getstring1;
        $pattern['d2g12']  = $http . $domain2 . $getstring1;
        $pattern['ipg12']  = $http . $ip . $getstring1;
+
        // Test all patterns
        $reg = false;
        foreach ($pattern as $key => $pat) {
                // Debug regex?
-               if (isDebugRegExpressionEnabled()) {
+               if (isDebugRegularExpressionEnabled()) {
                        // @TODO Are these convertions still required?
                        $pat = str_replace('.', "\.", $pat);
                        $pat = str_replace('@', "\@", $pat);
@@ -2733,7 +2734,7 @@ function isUrlValidSimple ($url) {
                } // END - if
 
                // Check if expression matches
-               $reg = ($reg || preg_match(('^' . $pat.'^'), $url));
+               $reg = ($reg || preg_match(('^' . $pat . '^'), $url));
 
                // Does it match?
                if ($reg === true) break;

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index c81d9d09d30ff956b334d6c60580579376e254d3..e7ef273e797b4a0562efcbe0501e61b9973c5509 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -356,11 +356,18 @@ function isDebugModeEnabled () {
 
 // Checks wether SQL debugging is enabled
 function isSqlDebuggingEnabled () {
-       return ((isConfigEntrySet('DEBUG_SQL')) && (getConfig('DEBUG_SQL') == 'Y'));
+       // Is cache set?
+       if (!isset($GLOBALS['is_sql_debug_enabled'])) {
+               // Determine if SQL debugging is enabled
+               $GLOBALS['is_sql_debug_enabled'] = ((isConfigEntrySet('DEBUG_SQL')) && (getConfig('DEBUG_SQL') == 'Y'));
+       } // END - if
+
+       // Return it
+       return $GLOBALS['is_sql_debug_enabled'];
 }
 
 // Checks wether we shall debug regular expressions
-function isDebugRegExpressionEnabled () {
+function isDebugRegularExpressionEnabled () {
        // Simply check it
        return ((isConfigEntrySet('DEBUG_REGEX')) && (getConfig('DEBUG_REGEX') == 'Y'));
 }