Project

General

Profile

Download (4.16 KB)

Bug #21283 » 12247_v3.diff

Administrator Admin, 2009-11-03 16:38

View differences:

typo3/sysext/cms/tslib/class.tslib_fe.php (working copy)
$this->content = str_replace('"media/', '"'.t3lib_extMgm::siteRelPath('cms').'tslib/media/', $this->content);
$this->content = str_replace('"typo3conf/ext/', '"'.$this->absRefPrefix.'typo3conf/ext/', $this->content);
$this->content = str_replace('"typo3/contrib/', '"'.$this->absRefPrefix.'typo3/contrib/', $this->content);
$this->content = str_replace('"typo3/ext/', '"' . $this->absRefPrefix . 'typo3/ext/', $this->content);
$this->content = str_replace('"typo3/sysext/' , '"' . $this->absRefPrefix . 'typo3/sysext/', $this->content);
$this->content = str_replace('"'.$GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'], '"'.$this->absRefPrefix.$GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'], $this->content);
// Process additional directories
$directories = t3lib_div::trimExplode(',', $GLOBALS['TYPO3_CONF_VARS']['FE']['additionalAbsRefPrefixDirectories'], true);
typo3/sysext/cms/tslib/class.tslib_pagegen.php (working copy)
// JavaScript library files
if (is_array($GLOBALS['TSFE']->pSetup['includeJSlibs.'])) {
foreach ($GLOBALS['TSFE']->pSetup['includeJSlibs.'] as $key => $JSfile) {
if (!is_array($JSfile)) {
$ss = $GLOBALS['TSFE']->pSetup['includeJSlibs.'][$key . '.']['external'] ? $JSfile : $GLOBALS['TSFE']->tmpl->getFileName($JSfile);
if ($ss) {
$type = $GLOBALS['TSFE']->pSetup['includeJSlibs.'][$key . '.']['type'];
......
}
$pageRenderer->addJsLibrary(
htmlspecialchars($key),
htmlspecialchars($GLOBALS['TSFE']->absRefPrefix . $ss),
htmlspecialchars($ss),
htmlspecialchars($type),
$GLOBALS['TSFE']->pSetup['includeJSlibs.'][$key . '.']['compress'] ? TRUE : FALSE,
$GLOBALS['TSFE']->pSetup['includeJSlibs.'][$key . '.']['forceOnTop'] ? TRUE : FALSE,
$GLOBALS['TSFE']->pSetup['includeJSlibs.'][$key . '.']['allWrap']
);
}
}
}
}
if (is_array($GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'])) {
foreach ($GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'] as $key => $JSfile) {
if (!is_array($JSfile)) {
$ss = $GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'][$key . '.']['external'] ? $JSfile : $GLOBALS['TSFE']->tmpl->getFileName($JSfile);
if ($ss) {
$type = $GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'][$key . '.']['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,
$GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'][$key . '.']['allWrap']
);
}
}
}
}
// JavaScript files
if (is_array($GLOBALS['TSFE']->pSetup['includeJS.'])) {
......
$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,
......
$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,
(3-3/3)