Fixed bug #12610: Inconsistent naming of "includeFooterJS"
authorSteffen Kamper <info@sk-typo3.de>
Tue, 17 Nov 2009 17:27:28 +0000 (17:27 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Tue, 17 Nov 2009 17:27:28 +0000 (17:27 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6456 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index 58963d3..56763a9 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@
 
 2009-11-17  Steffen Kamper  <info@sk-typo3.de>
 
+       * Fixed bug #12610: Inconsistent naming of "includeFooterJS"
        * Fixed bug #10119: Broken fe_adminLib.inc
        * Fixed bug #12616: Set recycler height dynamic
        * Fixed bug #12624: Unreplaced marker in login screen of classic skin
index a86020c..1a65277 100644 (file)
@@ -735,21 +735,21 @@ See <a href="http://wiki.typo3.org/index.php/TYPO3_3.8.1" target="_blank">wiki.t
                        }
                }
 
-               if (is_array($GLOBALS['TSFE']->pSetup['includeFooterJS.'])) {
-                       foreach ($GLOBALS['TSFE']->pSetup['includeFooterJS.'] as $key => $JSfile) {
+               if (is_array($GLOBALS['TSFE']->pSetup['includeJSFooter.'])) {
+                       foreach ($GLOBALS['TSFE']->pSetup['includeJSFooter.'] as $key => $JSfile) {
                                if (!is_array($JSfile)) {
-                                       $ss = $GLOBALS['TSFE']->pSetup['includeFooterJS.'][$key . '.']['external'] ? $JSfile : $GLOBALS['TSFE']->tmpl->getFileName($JSfile);
+                                       $ss = $GLOBALS['TSFE']->pSetup['includeJSFooter.'][$key . '.']['external'] ? $JSfile : $GLOBALS['TSFE']->tmpl->getFileName($JSfile);
                                        if ($ss) {
-                                               $type = $GLOBALS['TSFE']->pSetup['includeFooterJS.'][$key . '.']['type'];
+                                               $type = $GLOBALS['TSFE']->pSetup['includeJSFooter.'][$key . '.']['type'];
                                                if (! $type) {
                                                        $type = 'text/javascript';
                                                }
                                                $pageRenderer->addJsFooterFile(
                                                        htmlspecialchars($ss),
                                                        htmlspecialchars($type),
-                                                       $GLOBALS['TSFE']->pSetup['includeFooterJS.'][$key . '.']['compress'] ? TRUE : FALSE,
-                                                       $GLOBALS['TSFE']->pSetup['includeJS.'][$key . '.']['forceOnTop'] ? TRUE : FALSE,
-                                                       $GLOBALS['TSFE']->pSetup['includeJS.'][$key . '.']['allWrap']
+                                                       $GLOBALS['TSFE']->pSetup['includeJSFooter.'][$key . '.']['compress'] ? TRUE : FALSE,
+                                                       $GLOBALS['TSFE']->pSetup['includeJSFooter.'][$key . '.']['forceOnTop'] ? TRUE : FALSE,
+                                                       $GLOBALS['TSFE']->pSetup['includeJSFooter.'][$key . '.']['allWrap']
                                                );
                                        }
                                }