X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fstylesheet.php;h=4e58c9ad15efb703053b410cacda62d2fa49d1aa;hb=7d14f333e1ca0847509579c575a7d7335a7775e6;hp=817d790abe2f984769754ae5138a093687919795;hpb=414570c5081d337bb6c28dcf521bd8bca02f69e7;p=mailer.git

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index 817d790abe..4e58c9ad15 100644
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Style-Sheets werden hier abgelegt                *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -48,7 +48,7 @@ $STYLES = array(
 );
 
 // Add stylesheet for installation
-if ((basename($_SERVER['PHP_SELF']) == "install.php") || (!isInstalled()) || (REQUEST_ISSET_GET(('installing')))) $STYLES[] = "install.css";
+if ((isInstalling()) || (!isInstalled())) $STYLES[] = "install.css";
 
 // When no CSS output-mode is set, set it to file-output
 if (!isConfigEntrySet('css_php')) setConfigEntry('css_php', "FILE");
@@ -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("\" />");
 }