Bug #23474 ยป patch_15587.diff
| t3lib/class.t3lib_pagerenderer.php (working copy) | ||
|---|---|---|
|
foreach ($this->cssFiles as $file => $properties) {
|
||
|
$file = t3lib_div::resolveBackPath($file);
|
||
|
$file = t3lib_div::createVersionNumberedFilename($file);
|
||
|
$tag = '<link rel="' . $properties['rel'] . '" type="text/css" href="' .
|
||
|
htmlspecialchars($file) . '" media="' . $properties['media'] . '"' .
|
||
|
($properties['title'] ? ' title="' . $properties['title'] . '"' : '') .
|
||
|
$tag = '<link rel="' . htmlspecialchars($properties['rel']) . '" type="text/css" href="' .
|
||
|
htmlspecialchars($file) . '" media="' . htmlspecialchars($properties['media']) . '"' .
|
||
|
($properties['title'] ? ' title="' . htmlspecialchars($properties['title']) . '"' : '') .
|
||
|
$endingSlash . '>';
|
||
|
if ($properties['allWrap'] && strpos($properties['allWrap'], '|') !== FALSE) {
|
||
|
$tag = str_replace('|', $tag, $properties['allWrap']);
|
||
| ... | ... | |
|
foreach ($this->jsLibs as $name => $properties) {
|
||
|
$properties['file'] = t3lib_div::resolveBackPath($properties['file']);
|
||
|
$properties['file'] = t3lib_div::createVersionNumberedFilename($properties['file']);
|
||
|
$tag = '<script src="' . htmlspecialchars($properties['file']) . '" type="' . $properties['type'] . '"></script>';
|
||
|
$tag = '<script src="' . htmlspecialchars($properties['file']) . '" type="' . htmlspecialchars($properties['type']) . '"></script>';
|
||
|
if ($properties['allWrap'] && strpos($properties['allWrap'], '|') !== FALSE) {
|
||
|
$tag = str_replace('|', $tag, $properties['allWrap']);
|
||
|
}
|
||
| ... | ... | |
|
foreach ($this->jsFiles as $file => $properties) {
|
||
|
$file = t3lib_div::resolveBackPath($file);
|
||
|
$file = t3lib_div::createVersionNumberedFilename($file);
|
||
|
$tag = '<script src="' . htmlspecialchars($file) . '" type="' . $properties['type'] . '"></script>';
|
||
|
$tag = '<script src="' . htmlspecialchars($file) . '" type="' . htmlspecialchars($properties['type']) . '"></script>';
|
||
|
if ($properties['allWrap'] && strpos($properties['allWrap'], '|') !== FALSE) {
|
||
|
$tag = str_replace('|', $tag, $properties['allWrap']);
|
||
|
}
|
||
| typo3/sysext/cms/tslib/class.tslib_pagegen.php (working copy) | ||
|---|---|---|
|
);
|
||
|
} else {
|
||
|
$pageRenderer->addCssFile(
|
||
|
htmlspecialchars($ss),
|
||
|
$ss,
|
||
|
$GLOBALS['TSFE']->pSetup['includeCSS.'][$key . '.']['alternate'] ? 'alternate stylesheet' : 'stylesheet',
|
||
|
$GLOBALS['TSFE']->pSetup['includeCSS.'][$key . '.']['media'] ? $GLOBALS['TSFE']->pSetup['includeCSS.'][$key . '.']['media'] : 'all',
|
||
|
$GLOBALS['TSFE']->pSetup['includeCSS.'][$key . '.']['title'] ? $GLOBALS['TSFE']->pSetup['includeCSS.'][$key . '.']['title'] : '',
|
||
| ... | ... | |
|
$type = 'text/javascript';
|
||
|
}
|
||
|
$pageRenderer->addJsLibrary(
|
||
|
htmlspecialchars($key),
|
||
|
htmlspecialchars($ss),
|
||
|
htmlspecialchars($type),
|
||
|
$key,
|
||
|
$ss,
|
||
|
$type,
|
||
|
$GLOBALS['TSFE']->pSetup['includeJSlibs.'][$key . '.']['compress'] ? TRUE : FALSE,
|
||
|
$GLOBALS['TSFE']->pSetup['includeJSlibs.'][$key . '.']['forceOnTop'] ? TRUE : FALSE,
|
||
|
$GLOBALS['TSFE']->pSetup['includeJSlibs.'][$key . '.']['allWrap']
|
||
| ... | ... | |
|
$type = 'text/javascript';
|
||
|
}
|
||
|
$pageRenderer->addJsFooterLibrary(
|
||
|
htmlspecialchars($key),
|
||
|
htmlspecialchars($ss),
|
||
|
htmlspecialchars($type),
|
||
|
$key,
|
||
|
$ss,
|
||
|
$type,
|
||
|
$GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'][$key . '.']['compress'] ? TRUE : FALSE,
|
||
|
$GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'][$key . '.']['forceOnTop'] ? TRUE : FALSE,
|
||
|
$GLOBALS['TSFE']->pSetup['includeJSFooterlibs.'][$key . '.']['allWrap']
|
||
| ... | ... | |
|
$type = 'text/javascript';
|
||
|
}
|
||
|
$pageRenderer->addJsFile(
|
||
|
htmlspecialchars($ss),
|
||
|
htmlspecialchars($type),
|
||
|
$ss,
|
||
|
$type,
|
||
|
$GLOBALS['TSFE']->pSetup['includeJS.'][$key . '.']['compress'] ? TRUE : FALSE,
|
||
|
$GLOBALS['TSFE']->pSetup['includeJS.'][$key . '.']['forceOnTop'] ? TRUE : FALSE,
|
||
|
$GLOBALS['TSFE']->pSetup['includeJS.'][$key . '.']['allWrap']
|
||
| ... | ... | |
|
$type = 'text/javascript';
|
||
|
}
|
||
|
$pageRenderer->addJsFooterFile(
|
||
|
htmlspecialchars($ss),
|
||
|
htmlspecialchars($type),
|
||
|
$ss,
|
||
|
$type,
|
||
|
$GLOBALS['TSFE']->pSetup['includeJSFooter.'][$key . '.']['compress'] ? TRUE : FALSE,
|
||
|
$GLOBALS['TSFE']->pSetup['includeJSFooter.'][$key . '.']['forceOnTop'] ? TRUE : FALSE,
|
||
|
$GLOBALS['TSFE']->pSetup['includeJSFooter.'][$key . '.']['allWrap']
|
||