Fix for wrong SERVER_NAME usage (may cause trouble)

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

diff --git a/inc/template-functions.php b/inc/template-functions.php
index f296be7355dc7e9918f091c3a15b610d05eb574a..7bfe4b9ddda0b4d012fe98f5c6f9c9f122901fae 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -187,11 +187,8 @@ function compileFinalOutput () {
        // Do the final (general) compilation
        $GLOBALS['__output'] = doFinalCompilation($GLOBALS['__output']);
 
-       // Is the output mode not HTML?
-       if (!isHtmlOutputMode()) {
-               // Then remove entities
-               $GLOBALS['__output'] = compileUriCode($GLOBALS['__output']);
-       } // END - if
+       // Compile any other things out
+       $GLOBALS['__output'] = compileUriCode($GLOBALS['__output']);
 
        // Extension 'rewrite' installed?
        if ((isExtensionActive('rewrite')) && (!isCssOutputMode())) {
@@ -1381,7 +1378,7 @@ function compileUriCode ($code, $simple = TRUE) {
        } // END - if
 
        // Compile QUOT and other non-HTML codes
-       $code = str_replace($charsCompile['from'], $charsCompile['to'], decodeEntities($code));
+       $code = str_replace($charsCompile['from'], $charsCompile['to'], $code);
        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'code=' . $code);
 
        // Return compiled code