Removed @deprecated from CSS inline/PHP output

diff --git a/inc/stylesheet.php b/inc/stylesheet.php
index baaee6da2c3ff5de98744b6f37393a5ed2d9fdb0..3c16a1335914e3a281c4d35e8b2e5e21ef807308 100644 (file)
--- a/inc/stylesheet.php
+++ b/inc/stylesheet.php
@@ -86,7 +86,7 @@ if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
                                        break;
 
                                case 'FILE': // Output contents
                                        break;
 
                                case 'FILE': // Output contents

-                                       $GLOBALS['__page_header'] .= readFromFile($FQFN);
+                                       $GLOBALS['__page_header'] .= removeDeprecatedComment(readFromFile($FQFN));

                                        break;
 
                                default: // Invalid mode!
                                        break;
 
                                default: // Invalid mode!


@@ -116,7 +116,7 @@ if ((isCssOutputMode()) || (getCssPhp() == 'DIRECT')) {
        } // END - foreach
 
        // Load template
        } // 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';
 } else {
        // Now we load all CSS files from css.php!
        $OUT = '<link rel="stylesheet" type="text/css" href="{%url=css.php';

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 139759e5b0016c80bfe55cbcaaafbb557bb184fc..9d8412562c1ec72d02d08e28957a32ab5531a8ae 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -2399,5 +2399,27 @@ function getTemplateBasePath ($part) {
        return $GLOBALS[__FUNCTION__][$part];
 }
 
        return $GLOBALS[__FUNCTION__][$part];
 }
 

+// Removes comments with @DEPRECATED
+function removeDeprecatedComment ($output) {
+       // Explode it into pieces ... ;)
+       $lines = explode(chr(10), $output);
+
+       // Walk through all
+       $return = '';
+       foreach ($lines as $line) {
+               // Is there a @DEPRECATED?
+               if (isInString('@DEPRECATED', $line)) {
+                       // Ignore this line
+                       continue;
+               } // END - if
+
+               // Add it
+               $return .= $line . chr(13);
+       } // END - foreach
+
+       // Returned cleaned content
+       return $return;
+}
+

 // [EOF]
 ?>
 // [EOF]
 ?>

diff --git a/templates/de/html/css_inline.tpl b/templates/de/html/css_inline.tpl
index 0841fd704f23a22800477f18033620c9d7056819..73260d17ef162b3e3b972275c3e08d975869f2bd 100644 (file)
--- a/templates/de/html/css_inline.tpl
+++ b/templates/de/html/css_inline.tpl
@@ -1,5 +1,3 @@
 <style type="text/css">
 <style type="text/css">

-<!--

 $content
 $content

-//-->

 </style>
 </style>