Old template cache directory removed, SVN property set

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index b2d81171024f82b37b0d251b0fcc49594c01cccd..d77e9c93318db48f5d54adb9bd93d9bb55541c01 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -69,11 +69,11 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
                if ((isFileReadable($FQFN)) && (filesize($FQFN) > 0)) {
                        switch (getConfig('css_php')) {
                                case 'DIRECT': // Just link them (unsupported)
-                                       outputHtml('<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />');
+                                       $GLOBALS['page_header'] .= '<link rel="stylesheet" type="text/css" href="{%url=theme/' . getCurrentTheme() . '/' . $value . '%}" />';
                                        break;
 
                                case 'FILE': // Output contents
-                                       outputHtml(readFromFile($FQFN));
+                                       $GLOBALS['page_header'] .= readFromFile($FQFN);
                                        break;
 
                                default: // Invalid mode!
@@ -103,15 +103,15 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
        } // END - foreach
 
        // Load template
-       loadTemplate('css_inline', false, $OUT);
+       $GLOBALS['page_header'] .= loadTemplate('css_inline', true, $OUT);
 } else {
        // Now we load all CSS files from css.php!
        $OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
        if ((isInstallationPhase())) {
                // Default theme first
                $newTheme = 'default';
-               if (isGetRequestElementSet('theme'))  $newTheme = getRequestElement('theme');
-               if (isPostRequestElementSet('theme')) $newTheme = secureString(postRequestElement('theme'));
+               if (isGetRequestParameterSet('theme'))  $newTheme = getRequestParameter('theme');
+               if (isPostRequestParameterSet('theme')) $newTheme = secureString(postRequestParameter('theme'));
                $OUT .= '?theme=' . $newTheme . '&amp;installing=1';
        } else {
                // Add SVN revision to bypass caching problems
@@ -119,7 +119,7 @@ if ((getOutputMode() == 1) || (getConfig('css_php') == 'DIRECT')) {
        }
 
        // Close tag
-       outputHtml($OUT . '%}" />');
+       $GLOBALS['page_header'] .= $OUT . '%}" />';
 }
 
 // [EOF]