Fix for if sql_patches is not installed or older than 0.3.6

[mailer.git] / inc / template-functions.php

diff --git a/inc/template-functions.php b/inc/template-functions.php
index c3ecb5783475fc6dfed2e6db3b071e9bc7685d59..fad3dc2df35d68961d078876cebc6f263f70b6f9 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -234,7 +234,7 @@ function doFinalCompilation ($code, $insertComments = true) {
        $cnt = 0;
 
        // Compile all out
-       while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($cnt < 4)) {
+       while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($cnt < 5)) {
                // Init common variables
                $content = array();
                $newContent = '';
@@ -242,7 +242,7 @@ function doFinalCompilation ($code, $insertComments = true) {
                // Compile it
                //* DEBUG: */ debugOutput('<pre>'.encodeEntities($code).'</pre>');
                $eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code))) . '";';
-               //* DEBUG: */ if ($insertComments) die('<pre>'.linenumberCode($eval).'</pre>');
+               //* DEBUG: */ if (!$insertComments) print('<pre>'.linenumberCode($eval).'</pre>');
                eval($eval);
                //* DEBUG: */ die('<pre>'.encodeEntities($newContent).'</pre>');
 
@@ -351,8 +351,6 @@ function loadTemplate ($template, $return = false, $content = array()) {
 <div class="para">
        {--TEMPLATE_CONTENT--}
        <pre>' . print_r($content, true) . '</pre>
-       {--TEMPLATE_DATA--}
-       <pre>' . print_r($DATA, true) . '</pre>
 </div>';
                } else {
                        // No file!
@@ -1452,6 +1450,9 @@ function escapeQuotes ($str, $single = false) {
                // Escape all (including null)
                $str = addslashes($str);
        } else {
+               // Remove escaping of single quotes
+               $str = str_replace("\'", "'", $str);
+
                // Escape only double-quotes but prevent double-quoting
                $str = str_replace("\\\\", "\\", str_replace('"', "\\\"", $str));
        }