Fixed bug #8527: config.removeDefaultJS=1 leaves empty script block

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3760 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 107cbe3..24e7b05 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-05  Oliver Hader  <oliver@typo3.org>
+
+       * Fixed bug #8527: config.removeDefaultJS=1 leaves empty script block
+
 2008-06-05  Benjamin Mack  <benni@typo3.org>
 
        * Fixed bug #2905: t3skin - Styling of (non-dyn) tab menus is bad

diff --git a/typo3/sysext/cms/tslib/class.tslib_pagegen.php b/typo3/sysext/cms/tslib/class.tslib_pagegen.php
index de438d7..80b88a2 100755 (executable)
--- a/typo3/sysext/cms/tslib/class.tslib_pagegen.php
+++ b/typo3/sysext/cms/tslib/class.tslib_pagegen.php
@@ -811,7 +811,7 @@ See <a href="http://wiki.typo3.org/index.php/TYPO3_3.8.1" target="_blank">wiki.t
                } elseif ($GLOBALS['TSFE']->config['config']['removeDefaultJS']==='external')   {
                                // put default and inlineJS in external file
                        $GLOBALS['TSFE']->content.= TSpagegen::inline2TempFile($_scriptCode.$_inlineJS, 'js');
-               } else {
+               } elseif ($_inlineJS) {
                                // include only inlineJS
                        $GLOBALS['TSFE']->content.='
        <script type="text/javascript">