A little better debugging, handling of percent char

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 0f065e1189eeed1dcd74a4937feaff790316f9a5..d586a0aebe46452c2b443ded6a804cf381612d41 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -735,7 +735,7 @@ function getArrayFromSupportedSqlEngines ($support = 'YES') {
                                array_push($engines, $content);
                        } elseif (isDebugModeEnabled()) {
                                // Log it away in debug mode
-                               logDebugMessage(__FUNCTION__, __LINE__, 'Engine ' . $content['Engine'] . ' is not supported (' . $content['Supported'] . ')');
+                               logDebugMessage(__FUNCTION__, __LINE__, 'Engine ' . $content['Engine'] . ' is not supported (' . $content['Supported'] . ' - ' . $support . ')');
                        }
                } // END - if
        } else {

diff --git a/inc/http-functions.php b/inc/http-functions.php
index cfa0e19fbc575365cf5e3c299747c7a9e22d5fb3..cf8377038873faf9436660cbb5b31a253517548d 100644 (file)
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -862,7 +862,7 @@ function logWrongServerNameRedirect () {
        // Is ext-sql_patches at least version 0.9.2?
        if (isExtensionInstalledAndNewer('sql_patches', '0.9.2')) {
                // Is there an entry?
-               if (countSumTotalData(detectServerName(), 'server_name_log', 'server_name_id', 'server_name', TRUE, sprintf(" AND `server_name_remote_addr`='%s' AND `server_name_ua`='%s' AND `server_name_referrer`='%s'", SQL_ESCAPE(detectRemoteAddr(TRUE)), SQL_ESCAPE(detectUserAgent(TRUE)), SQL_ESCAPE(detectReferer(TRUE)))) == 1) {
+               if (countSumTotalData(detectServerName(), 'server_name_log', 'server_name_id', 'server_name', TRUE, str_replace('%', '{PER}', sprintf(" AND `server_name_remote_addr`='%s' AND `server_name_ua`='%s' AND `server_name_referrer`='%s'", SQL_ESCAPE(detectRemoteAddr(TRUE)), SQL_ESCAPE(detectUserAgent(TRUE)), SQL_ESCAPE(detectReferer(TRUE))))) == 1) {
                        // Update counter, as all are the same
                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_server_name_log`