2009-09-20 Steffen Kamper <info@sk-typo3.de>
+ * Fixed bug #12017: Wrong Inclusion in tceforms and tceforms_fe
* Fixed bug #12016: JS and CSS inclusion may contain path/../path2/file
* Fixed bug #11933: FrontendEditing (classic) does not work when editing forms on page
$pageRenderer->addInlineSettingArray('', $resizableSettings);
$this->loadJavascriptLib('../t3lib/jsfunc.evalfield.js');
-
- // @TODO: Change to loadJavascriptLib(), but fix "TS = new typoScript()" issue first - see bug #9494
- $jsFile[] = '<script type="text/javascript" src="'.$this->backPath.'jsfunc.tbe_editor.js"></script>';
+ $this->loadJavascriptLib('jsfunc.tbe_editor.js');
// needed for tceform manipulation (date picker)
$typo3Settings = array(
* @return void
*/
public function loadJavascriptLib($lib) {
- if (!isset($GLOBALS['TSFE']->additionalHeaderData[$lib])) {
- $GLOBALS['TSFE']->additionalHeaderData[$lib] = '<script type="text/javascript" src="' . $this->backPath . $lib . '"></script>';
- }
+ /** @var $pageRenderer t3lib_PageRenderer */
+ $pageRenderer = $GLOBALS['TSFE']->getPageRenderer();
+ $pageRenderer->addJsLibrary($lib, $this->backPath . $lib);
+
}
/**
* @return void
*/
public function addStyleSheet($key, $href, $title='', $relation='stylesheet') {
- if (!isset($GLOBALS['TSFE']->additionalHeaderData[$key])) {
- $GLOBALS['TSFE']->additionalHeaderData[$key] = '<link rel="' . $relation . '" type="text/css" href="' . $href . '"' . ($title ? (' title="' . $title . '"') : '') . ' />';
- }
+ /** @var $pageRenderer t3lib_PageRenderer */
+ $pageRenderer = $GLOBALS['TSFE']->getPageRenderer();
+ $pageRenderer->addCssFile($this->backPath . $href, $relation, 'screen', $title);
}
/**