SQL_FETCHROW()->SQL_FETCHARRAY() and other improvements

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index 7b9e64ad5ba58d1bd2b2b5b3a265f780c042f51c..6e3cda3de9dad272524e41e5964431122e6f1cbe 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -97,11 +97,6 @@ function outputHtml ($htmlCode, $newLine = true) {
                        clearOutputBuffer();
                } // END - if
 
-               // Extension 'rewrite' installed?
-               if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
-                       $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
-               } // END - if
-
                // Send all HTTP headers
                sendHttpHeaders();
 
@@ -111,11 +106,6 @@ function outputHtml ($htmlCode, $newLine = true) {
                // Output code here, DO NOT REMOVE! ;-)
                outputRawCode($GLOBALS['output']);
        } elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) {
-               // Rewrite links when rewrite extension is active
-               if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
-                       $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
-               } // END - if
-
                // Send all HTTP headers
                sendHttpHeaders();
 
@@ -182,6 +172,11 @@ function compileFinalOutput () {
                $cnt++;
        } // END - while
 
+       // Extension 'rewrite' installed?
+       if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
+               $GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
+       } // END - if
+
        // Compress it?
        if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
                // Compress it for HTTP gzip