Bug #15098 » class.tslib_pagegen.php.patch
| class.tslib_pagegen.php 2007-02-24 17:02:48.000000000 +0100 | ||
|---|---|---|
|
}
|
||
|
}
|
||
|
}
|
||
|
return Array(count($functions)?'
|
||
|
if ($GLOBALS['TSFE']->config['config']['removeDefaultJS']=='external' && $GLOBALS['TSFE']->config['config']['removeAdditionalJS']=='external') {
|
||
|
$GLOBALS['TSFE']->JSCode .= implode(chr(10),$functions);
|
||
|
$functions = array();
|
||
|
}
|
||
|
return Array((count($functions) || count($setEvents))?'
|
||
|
<script type="text/javascript">
|
||
|
/*<![CDATA[*/
|
||
|
'.implode(chr(10),$functions).'
|
||
| ... | ... | |
|
if (is_array($GLOBALS['TSFE']->config['INTincScript'])) {
|
||
|
// Storing the JSCode and JSImgCode vars...
|
||
|
$GLOBALS['TSFE']->additionalHeaderData['JSCode'] = $GLOBALS['TSFE']->JSCode;
|
||
|
$GLOBALS['TSFE']->additionalHeaderData['JSImgCode'] = $GLOBALS['TSFE']->JSImgCode;
|
||
|
if (!($GLOBALS['TSFE']->config['config']['removeDefaultJS']=='external' && $GLOBALS['TSFE']->config['config']['removeAdditionalJS']=='external')) {
|
||
|
$GLOBALS['TSFE']->additionalHeaderData['JSCode'] = $GLOBALS['TSFE']->JSCode;
|
||
|
$GLOBALS['TSFE']->additionalHeaderData['JSImgCode'] = $GLOBALS['TSFE']->JSImgCode;
|
||
|
}
|
||
|
$GLOBALS['TSFE']->config['INTincScript_ext']['divKey'] = $GLOBALS['TSFE']->uniqueHash();
|
||
|
$GLOBALS['TSFE']->config['INTincScript_ext']['additionalHeaderData'] = $GLOBALS['TSFE']->additionalHeaderData; // Storing the header-data array
|
||
|
$GLOBALS['TSFE']->config['INTincScript_ext']['additionalJavaScript'] = $GLOBALS['TSFE']->additionalJavaScript; // Storing the JS-data array
|
||
|
if (!($GLOBALS['TSFE']->config['config']['removeDefaultJS']=='external' && $GLOBALS['TSFE']->config['config']['removeAdditionalJS']=='external')) {
|
||
|
$GLOBALS['TSFE']->config['INTincScript_ext']['additionalJavaScript'] = $GLOBALS['TSFE']->additionalJavaScript; // Storing the JS-data array
|
||
|
}
|
||
|
$GLOBALS['TSFE']->config['INTincScript_ext']['additionalCSS'] = $GLOBALS['TSFE']->additionalCSS; // Storing the Style-data array
|
||
|
$GLOBALS['TSFE']->additionalHeaderData = array('<!--HD_'.$GLOBALS['TSFE']->config['INTincScript_ext']['divKey'].'-->'); // Clearing the array
|
||
| ... | ... | |
|
/*]]>*/
|
||
|
</script>';
|
||
|
} elseif ($GLOBALS['TSFE']->config['config']['removeDefaultJS']==='external') {
|
||
|
$GLOBALS['TSFE']->content.= TSpagegen::inline2TempFile($_scriptCode, 'js');
|
||
|
$GLOBALS['TSFE']->content.= TSpagegen::inline2TempFile(
|
||
|
$_scriptCode.
|
||
|
($GLOBALS['TSFE']->config['config']['removeAdditionalJS']=='external'?
|
||
|
chr(10).implode($GLOBALS['TSFE']->additionalJavaScript,chr(10)).chr(10).$GLOBALS['TSFE']->JSCode.chr(10).$GLOBALS['TSFE']->JSImgCode:
|
||
|
''
|
||
|
),
|
||
|
'js'
|
||
|
);
|
||
|
if ($GLOBALS['TSFE']->config['config']['removeAdditionalJS']=='external') {
|
||
|
$GLOBALS['TSFE']->additionalHeaderData['JSImgCode']='';
|
||
|
$GLOBALS['TSFE']->additionalHeaderData['JSCode']='';
|
||
|
}
|
||
|
}
|
||
|
$GLOBALS['TSFE']->content.= chr(10).implode($GLOBALS['TSFE']->additionalHeaderData,chr(10)).'
|
||
|
'.$JSef[0].'
|
||
|
$GLOBALS['TSFE']->content.= chr(10).implode($GLOBALS['TSFE']->additionalHeaderData,chr(10)).chr(10).$JSef[0].'
|
||
|
</head>';
|
||
|
if ($GLOBALS['TSFE']->pSetup['frameSet.']) {
|
||
|
$fs = t3lib_div::makeInstance('tslib_frameset');
|
||