Project

General

Profile

Bug #18049 » 7265_v3.diff

Administrator Admin, 2008-12-09 10:30

View differences:

typo3/alt_db_navframe.php (working copy)
// Function, loading the list frame from navigation tree:
function jumpTo(id, linkObj, highlightID, bank) { //
var theUrl = top.TS.PATH_typo3 + top.currentSubScript + "?id=" + id;
var theUrl = top.TS.PATH_typo3 + top.currentSubScript ;
if (theUrl.indexOf("?") != -1) {
theUrl += "&id=" + id
} else {
theUrl += "?id=" + id
}
top.fsMod.currentBank = bank;
if (top.condensedMode) top.content.location.href = theUrl;
else parent.list_frame.location.href=theUrl;
if (top.condensedMode) {
top.content.location.href = theUrl;
} else {
parent.list_frame.location.href=theUrl;
}
'.($this->doHighlight ? 'Tree.highlightActiveItem("web", highlightID + "_" + bank);' : '').'
'.(!$GLOBALS['CLIENT']['FORMSTYLE'] ? '' : 'if (linkObj) linkObj.blur(); ').'
......
$SOBE->printContent();
}
?>
?>
typo3/alt_file_navframe.php (working copy)
// Function, loading the list frame from navigation tree:
function jumpTo(id, linkObj, highlightID, bank) {
var theUrl = top.TS.PATH_typo3 + top.currentSubScript + "?id=" + id;
var theUrl = top.TS.PATH_typo3 + top.currentSubScript ;
if (theUrl.indexOf("?") != -1) {
theUrl += "&id=" + id
} else {
theUrl += "?id=" + id
}
top.fsMod.currentBank = bank;
if (top.condensedMode) top.content.location.href = theUrl;
else parent.list_frame.location.href = theUrl;
if (top.condensedMode) {
top.content.location.href = theUrl;
} else {
parent.list_frame.location.href=theUrl;
}
'.($this->doHighlight ? 'Tree.highlightActiveItem("file", highlightID + "_" + bank);' : '').'
'.(!$CLIENT['FORMSTYLE'] ? '' : 'if (linkObj) linkObj.blur(); ').'
typo3/alt_mod_frameset.php (working copy)
$URL_nav = htmlspecialchars($nav.'&currentSubScript='.rawurlencode($script));
// List frame URL:
$URL_list = htmlspecialchars($this->exScript?$this->exScript:($script.($this->id?'?id='.rawurlencode($this->id):'')));
$URL_list = htmlspecialchars($this->exScript ? $this->exScript : ($script . ($this->id ? (strpos($script, '?') ? '&' : '?' ) . 'id=' . rawurlencode($this->id) : '')));
// Start page output
$TBE_TEMPLATE->docType='xhtml_frames';
$this->content = $TBE_TEMPLATE->startPage('Frameset');
typo3/template.php (working copy)
global $TBE_STYLES;
// Setting default scriptID:
$this->scriptID = ereg_replace('^.*\/(sysext|ext)\/','ext/',substr(PATH_thisScript,strlen(PATH_site)));
if (($temp_M = (string) t3lib_div::_GET('M')) && $GLOBALS['TBE_MODULES']['_PATHS'][$temp_M]) {
$this->scriptID = ereg_replace('^.*\/(sysext|ext)\/', 'ext/', $GLOBALS['TBE_MODULES']['_PATHS'][$temp_M] . 'index.php');
} else {
$this->scriptID = ereg_replace('^.*\/(sysext|ext)\/', 'ext/', substr(PATH_thisScript, strlen(PATH_site)));
}
if (TYPO3_mainDir!='typo3/' && substr($this->scriptID,0,strlen(TYPO3_mainDir)) == TYPO3_mainDir) {
$this->scriptID = 'typo3/'.substr($this->scriptID,strlen(TYPO3_mainDir)); // This fixes if TYPO3_mainDir has been changed so the script ids are STILL "typo3/..."
}
(2-2/2)