Opps

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

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 6f1006a2a5da7142c50d77236523eb1890d7d853..55a4e8299e76071a4a285ba9fdd93fd8a83c3754 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -1363,14 +1363,15 @@ function compileUriCode ($code, $simple = TRUE) {
        // Compile constants
        if ($simple === FALSE) {
                // Add more 'from'
-               array_push($charsCompile['from'], '{--', '--}');
+               array_unshift($charsCompile['from'], '{--', '--}');
 
                // Add more 'to'
-               array_push($charsCompile['to'], '".', '."');
+               array_unshift($charsCompile['to'], '".', '."');
        } // END - if
 
        // Compile QUOT and other non-HTML codes
-       $code = str_replace($charsCompile['from'], $charsCompile['to'], $code);
+       $code = str_replace($charsCompile['from'], $charsCompile['to'], decodeEntities($code));
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'code=' . $code);
 
        // Return compiled code
        return $code;
@@ -1885,7 +1886,7 @@ function addPageHeaderFooter () {
 
 // Generates meta description for current module and 'what' value
 function generateMetaDescriptionCode () {
-       // Only include from guest area and if sql_patches has correct version
+       // Only include from guest area and if ext-sql_patches has correct version
        if ((getModule() == 'index') && (isExtensionInstalledAndNewer('sql_patches', '0.1.6'))) {
                // Output it directly
                $GLOBALS['__page_header'] .= '<meta name="description" content="' . '{?MAIN_TITLE?} ' . trim(getConfig('title_middle')) . ' ' . getTitleFromMenu('guest', getWhat()) . '" />';