Fixed bug #12168: Empty line in general header comment
authorSteffen Kamper <info@sk-typo3.de>
Wed, 21 Oct 2009 14:02:41 +0000 (14:02 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Wed, 21 Oct 2009 14:02:41 +0000 (14:02 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6218 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_pagegen.php

index 83e07c0..09fdea7 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,7 @@
 
 2009-10-21  Steffen Kamper  <info@sk-typo3.de>
 
-       * Fixed bug #12250: t3skin: Headers are smaller than the text
+       * Fixed bug #12168: Empty line in general header comment
        * Fixed bug #12175: User Setup don't check file time of ENABLE_INSTALL_TOOL
        * Fixed bug #12237: Use flash-messages in user-settings (thanks to Georg Ringer)
        * Follow-up to bug #12272: reverted renaming of step
index 5fa9127..3c86546 100644 (file)
@@ -355,9 +355,9 @@ See <a href="http://wiki.typo3.org/index.php/TYPO3_3.8.1" target="_blank">wiki.t
                        }
                }
 
-               $customContent = $GLOBALS['TSFE']->config['config']['headerComment'];
-               if (trim($customContent)) {
-                       $pageRenderer->addInlineComment($customContent);
+               $headerComment = $GLOBALS['TSFE']->config['config']['headerComment'];
+               if (trim($headerComment)) {
+                       $pageRenderer->addInlineComment("\t" . str_replace("\n", "\n\t", trim($headerComment)) . "\n");
                }
 
                        // Setting charset:
@@ -470,8 +470,7 @@ See <a href="http://wiki.typo3.org/index.php/TYPO3_3.8.1" target="_blank">wiki.t
                        // Setting charset meta tag:
                $pageRenderer->setCharSet($theCharset);
 
-               $pageRenderer->addInlineComment('
-       This website is powered by TYPO3 - inspiring people to share!
+               $pageRenderer->addInlineComment('       This website is powered by TYPO3 - inspiring people to share!
        TYPO3 is a free open source Content Management Framework initially created by Kasper Skaarhoj and licensed under GNU/GPL.
        TYPO3 is copyright 1998-2009 of Kasper Skaarhoj. Extensions are copyright of their respective owners.
        Information and contribution at http://typo3.com/ and http://typo3.org/