Several fixes/improvements:

[mailer.git] / inc / db / lib-mysql3.php

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 14a4b6f9cc8cc5078b1a625c018ffa1f84806066..735e6dd89943b4a5b34f2c81ce42d13e5d238ff1 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -74,8 +74,9 @@ function SQL_QUERY ($sqlString, $F, $L) {
        // Replace {PER}
        $sqlString = str_replace('{PER}', '%', $sqlString);
 
-       // Compile config out
-       $sqlString = FILTER_COMPILE_CONFIG($sqlString, true);
+       // Compile config entries out
+       $eval = "\$sqlString = \"".FILTER_COMPILE_CONFIG(escapeQuotes($sqlString))."\";";
+       eval($eval);
 
        // Starting time
        $querytimeBefore = microtime(true);
@@ -284,7 +285,7 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure
        // Debugging
        //
        //* DEBUG: */ $fp = fopen(getConfig('CACHE_PATH') . 'escape_debug.log', 'a') or app_die(__FILE__, __LINE__, "Cannot write debug.log!");
-       //* DEBUG: */ fwrite($fp, $F.'('.$L."): ".str_replace("\r", '', str_replace("\n", " ", $eval))."\n");
+       //* DEBUG: */ fwrite($fp, $F.'('.$L."): ".str_replace("\r", '', str_replace("\n", ' ', $eval))."\n");
        //* DEBUG: */ fclose($fp);
 
        if ($run === true) {