Project

General

Profile

Download (3 KB)

Bug #21973 » 13262_hardcoded-typo3_v3.patch

Administrator Admin, 2010-02-26 15:43

View differences:

typo3/init.php (Arbeitskopie)
// *******************************
// Fix BACK_PATH, if the TYPO3_mainDir is set to something else than
// typo3/, this is a workaround because the conf.php of the old modules
// still have "typo3/" hardcoded. Can be removed once we don't have to worry about
// legacy modules (with conf.php and $BACK_PATH) anymore. See RFC / Bug #13262 for more details.
// *******************************
if (isset($BACK_PATH) && strlen($BACK_PATH) > 0 && TYPO3_mainDir != 'typo3/' && substr($BACK_PATH, -7) == '/typo3/') {
$BACK_PATH = substr($BACK_PATH, 0, -6) . TYPO3_mainDir;
}
// *******************************
// Checking path
// *******************************
$temp_path = str_replace('\\','/',dirname(PATH_thisScript).'/');
typo3/sysext/cms/tslib/class.tslib_pagegen.php (Arbeitskopie)
/** @var $pageRenderer t3lib_PageRenderer */
$pageRenderer = $GLOBALS['TSFE']->getPageRenderer();
$pageRenderer->backPath = 'typo3/';
$pageRenderer->backPath = TYPO3_mainDir;
if ($GLOBALS['TSFE']->config['config']['moveJsFromHeaderToFooter']) {
$pageRenderer->enableMoveJsFromHeaderToFooter();
typo3/sysext/cms/tslib/class.tslib_content.php (Arbeitskopie)
$typeConf = $conf[$conf['type'] . '.'];
//add SWFobject js-file
$GLOBALS['TSFE']->getPageRenderer()->addJsFile('typo3/contrib/flashmedia/swfobject/swfobject.js');
$GLOBALS['TSFE']->getPageRenderer()->addJsFile(TYPO3_mainDir . 'contrib/flashmedia/swfobject/swfobject.js');
$player = $this->stdWrap($conf[$conf['type'] . '.']['player'], $conf[$conf['type'] . '.']['player.']);
$installUrl = $conf['installUrl'] ? $conf['installUrl'] : $prefix . 'typo3/contrib/flashmedia/swfobject/expressInstall.swf';
$installUrl = $conf['installUrl'] ? $conf['installUrl'] : $prefix . TYPO3_mainDir . 'contrib/flashmedia/swfobject/expressInstall.swf';
$filename = $this->stdWrap($conf['file'], $conf['file.']);
if ($filename && $conf['forcePlayer']) {
if (strpos($filename, '://') !== FALSE) {
......
$typeConf = $conf[$conf['type'] . '.'];
//add QTobject js-file
$GLOBALS['TSFE']->getPageRenderer()->addJsFile('typo3/contrib/flashmedia/qtobject/qtobject.js');
$GLOBALS['TSFE']->getPageRenderer()->addJsFile(TYPO3_mainDir . 'contrib/flashmedia/qtobject/qtobject.js');
$replaceElementIdString = uniqid('mmqt');
$GLOBALS['TSFE']->register['MMQTID'] = $replaceElementIdString;
$qtObject = 'QTObject' . $replaceElementIdString;
(3-3/3)