Moved "fix" files (which only helps to fix stuff) in own inc/fixes/ folder.

[mailer.git] / inc / stylesheet.php

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index baaee6da2c3ff5de98744b6f37393a5ed2d9fdb0..5cc6d4b953852de0f1496bb2a955b7333d9e9dca 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Style-Sheets werden hier abgelegt                *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -86,7 +81,7 @@ if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
                                        break;
 
                                case 'FILE': // Output contents
-                                       $GLOBALS['__page_header'] .= readFromFile($FQFN);
+                                       $GLOBALS['__page_header'] .= removeDeprecatedComment(readFromFile($FQFN));
                                        break;
 
                                default: // Invalid mode!
@@ -116,16 +111,17 @@ if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
        } // END - foreach
 
        // Load template
-       $GLOBALS['__page_header'] .= loadTemplate('css_inline', TRUE, $OUT);
+       $GLOBALS['__page_header'] .= loadTemplate('css_inline', TRUE, removeDeprecatedComment($OUT));
 } else {
        // Now we load all CSS files from css.php!
        $OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';
+
        if ((isInstaller())) {
                // Default theme first
                $OUT .= '?theme=' . getCurrentTheme() . '&amp;installing=1';
        } else {
-               // Add SVN revision to bypass caching problems
-               $OUT .= '?rev=' . getCurrentRepositoryRevision();
+               // Add version + a number to bypass caching problems
+               $OUT .= '?ver={?FULL_VERSION?}&amp;cb={?CACHE_BUSTER?}';
        }
 
        // Close tag