Fix for broken cache handling in lib-mysql3.php, debug lines added

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index e982d87793c16b2243f591fab405b05feb1378e2..acb23bd23800376c4ef95661b8eb9f07413213f9 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -44,6 +44,8 @@ if (!defined('__SECURITY')) {
 function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
        // Do we have cache?
        if (!isset($GLOBALS[__FUNCTION__][$sqlString])) {
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called: ' . $sqlString);
+
                // Trim SQL string
                $sqlStringModified = trim($sqlString);
 
@@ -72,11 +74,14 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
                // Cache it and remember as last SQL query
                $GLOBALS[__FUNCTION__][$sqlString] = $sqlStringModified;
                $GLOBALS['last_sql'] = $sqlStringModified;
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Stored cache: ' . $sqlStringModified);
        }  else {
-               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cache used!');
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cache used: ' . $sqlString);
 
                // Use cache (to save a lot function calls
-               $sqlString = $GLOBALS[__FUNCTION__][$sqlString];
+               $GLOBALS['last_sql'] = $GLOBALS[__FUNCTION__][$sqlString];
+
+               //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cache is: ' . $sqlString);
        }
 
        // Starting time

diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php
index f6874279e01101833220ce38095a5bf95775f72f..08628bc4e28dd8b471c3a9752355d6e860b1e0dd 100644 (file)
--- a/inc/libs/country_functions.php
+++ b/inc/libs/country_functions.php
@@ -53,6 +53,7 @@ function generateCountryInfo ($id) {
        if (SQL_NUMROWS($result) == 1) {
                // Load entry
                $content = SQL_FETCHARRAY($result);
+               //* DEBUG: */ print($id.'=<pre>'.print_r($content, true).'</pre>');
 
                // Construct human-readable description
                $ret = sprintf("%s (%s)", $content['descr'], $content['code']);