More globals rewritten, see ticket #100

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index e9816671756d9a038ba6bd77ec9597370a9091fc..4e58c9ad15efb703053b410cacda62d2fa49d1aa 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -80,12 +80,12 @@ if (($GLOBALS['output_mode'] == "1") || (getConfig('css_php') == "DIRECT")) {
 } else {
        // Now we load all CSS files from css.php!
        OUTPUT_HTML("<link rel=\"stylesheet\" type=\"text/css\" href=\"{!URL!}/css.php", false);
-       if (isInstalling()) {
+       if ((isInstalling()) || (!isInstalled())) {
                // Default theme first
-               $NEW_THEME = "default";
-               if (REQUEST_ISSET_GET(('theme')))  $NEW_THEME = REQUEST_GET(('theme'));
-               if (REQUEST_ISSET_POST(('theme'))) $NEW_THEME = SQL_ESCAPE(REQUEST_POST('theme'));
-               OUTPUT_HTML("?theme=".$NEW_THEME."&amp;installing=1", false);
+               $newTheme = "default";
+               if (REQUEST_ISSET_GET(('theme')))  $newTheme = REQUEST_GET(('theme'));
+               if (REQUEST_ISSET_POST(('theme'))) $newTheme = SQL_ESCAPE(REQUEST_POST('theme'));
+               OUTPUT_HTML("?theme=".$newTheme."&amp;installing=1", false);
        } // END - if
        OUTPUT_HTML("\" />");
 }