Project

General

Profile

Bug #21283 » 12247_v2.diff

Administrator Admin, 2009-10-16 17:45

View differences:

typo3/sysext/cms/tslib/class.tslib_pagegen.php (Arbeitskopie)
if (is_array($GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'])) {
foreach ($GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'] as $key => $JSfile) {
$ss = $GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'][$key . '.']['external'] ? $JSfile : $GLOBALS['TSFE']->tmpl->getFileName($JSfile);
$ss = $GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'][$key . '.']['external'] ? $JSfile : $GLOBALS['TSFE']->absRefPrefix . $GLOBALS['TSFE']->tmpl->getFileName($JSfile);
if ($ss) {
$type = $GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'][$key . '.']['type'];
if (! $type) {
......
}
$pageRenderer->addJsFooterLibrary(
htmlspecialchars($key),
htmlspecialchars($GLOBALS['TSFE']->absRefPrefix . $ss),
htmlspecialchars($ss),
htmlspecialchars($type),
$GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'][$key . '.']['compress'] ? TRUE : FALSE,
$GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'][$key . '.']['forceOnTop'] ? TRUE : FALSE,
......
if (is_array($GLOBALS['TSFE']->pSetup['includeJS.'])) {
foreach ($GLOBALS['TSFE']->pSetup['includeJS.'] as $key => $JSfile) {
if (!is_array($JSfile)) {
$ss = $GLOBALS['TSFE']->pSetup['includeJS.'][$key . '.']['external'] ? $JSfile : $GLOBALS['TSFE']->tmpl->getFileName($JSfile);
$ss = $GLOBALS['TSFE']->pSetup['includeJS.'][$key . '.']['external'] ? $JSfile : $GLOBALS['TSFE']->absRefPrefix . $GLOBALS['TSFE']->tmpl->getFileName($JSfile);
if ($ss) {
$type = $GLOBALS['TSFE']->pSetup['includeJS.'][$key . '.']['type'];
if (! $type) {
$type = 'text/javascript';
}
$pageRenderer->addJsFile(
htmlspecialchars($GLOBALS['TSFE']->absRefPrefix . $ss),
htmlspecialchars($ss),
htmlspecialchars($type),
$GLOBALS['TSFE']->pSetup['includeJS.'][$key . '.']['compress'] ? TRUE : FALSE,
$GLOBALS['TSFE']->pSetup['includeJS.'][$key . '.']['forceOnTop'] ? TRUE : FALSE,
......
if (is_array($GLOBALS['TSFE']->pSetup['includeFooterJS.'])) {
foreach ($GLOBALS['TSFE']->pSetup['includeFooterJS.'] as $key => $JSfile) {
if (!is_array($JSfile)) {
$ss = $GLOBALS['TSFE']->pSetup['includeFooterJS.'][$key . '.']['external'] ? $JSfile : $GLOBALS['TSFE']->tmpl->getFileName($JSfile);
$ss = $GLOBALS['TSFE']->pSetup['includeFooterJS.'][$key . '.']['external'] ? $JSfile : $GLOBALS['TSFE']->absRefPrefix . $GLOBALS['TSFE']->tmpl->getFileName($JSfile);
if ($ss) {
$type = $GLOBALS['TSFE']->pSetup['includeFooterJS.'][$key . '.']['type'];
if (! $type) {
$type = 'text/javascript';
}
$pageRenderer->addJsFooterFile(
htmlspecialchars($GLOBALS['TSFE']->absRefPrefix . $ss),
htmlspecialchars($ss),
htmlspecialchars($type),
$GLOBALS['TSFE']->pSetup['includeFooterJS.'][$key . '.']['compress'] ? TRUE : FALSE,
$GLOBALS['TSFE']->pSetup['includeJS.'][$key . '.']['forceOnTop'] ? TRUE : FALSE,
(2-2/3)