Bug #20803 ยป 0011611.patch
| typo3/sysext/cms/tslib/class.tslib_pagegen.php (working copy) | ||
|---|---|---|
|
if (!is_array($iCSSfile)) {
|
||
|
$ss=$GLOBALS['TSFE']->tmpl->getFileName($iCSSfile);
|
||
|
if ($ss) {
|
||
|
if ($GLOBALS['TSFE']->pSetup['includeCSS.'][$key.'.']['condition']) {
|
||
|
$GLOBALS['TSFE']->content.= chr(10) . chr(9) . '<!--[if ' . $GLOBALS['TSFE']->pSetup['includeCSS.'][$key.'.']['condition'] . ']>';
|
||
|
}
|
||
|
if ($GLOBALS['TSFE']->pSetup['includeCSS.'][$key.'.']['import']) {
|
||
|
if (substr($ss,0,1)!='/') { // To fix MSIE 6 that cannot handle these as relative paths (according to Ben v Ende)
|
||
|
$ss = t3lib_div::dirname(t3lib_div::getIndpEnv('SCRIPT_NAME')).'/'.$ss;
|
||
| ... | ... | |
|
($GLOBALS['TSFE']->pSetup['includeCSS.'][$key.'.']['media'] ? ' media="'.htmlspecialchars($GLOBALS['TSFE']->pSetup['includeCSS.'][$key.'.']['media']).'"' : '').
|
||
|
' />';
|
||
|
}
|
||
|
if ($GLOBALS['TSFE']->pSetup['includeCSS.'][$key.'.']['condition']) {
|
||
|
$GLOBALS['TSFE']->content.= chr(10) . chr(9) . '<![endif]-->';
|
||
|
}
|
||
|
}
|
||
|
}
|
||
|
}
|
||
| ... | ... | |
|
if (!is_array($JSfile)) {
|
||
|
$ss = $GLOBALS['TSFE']->tmpl->getFileName($JSfile);
|
||
|
if ($ss) {
|
||
|
if ($GLOBALS['TSFE']->pSetup['includeJS.'][$key.'.']['condition']) {
|
||
|
$GLOBALS['TSFE']->content.= chr(10) . chr(9) . '<!--[if ' . $GLOBALS['TSFE']->pSetup['includeJS.'][$key.'.']['condition'] . ']>';
|
||
|
}
|
||
|
$type = $GLOBALS['TSFE']->pSetup['includeJS.'][$key.'.']['type'];
|
||
|
if (!$type) $type = 'text/javascript';
|
||
|
$GLOBALS['TSFE']->content.='
|
||
|
<script src="' . htmlspecialchars($GLOBALS['TSFE']->absRefPrefix . $ss) . '" type="' . htmlspecialchars($type) . '"></script>';
|
||
|
if ($GLOBALS['TSFE']->pSetup['includeJS.'][$key.'.']['condition']) {
|
||
|
$GLOBALS['TSFE']->content.= chr(10) . chr(9) . '<![endif]-->';
|
||
|
}
|
||
|
}
|
||
|
}
|
||
|
}
|
||