Project

General

Profile

Download (3.1 KB)

Bug #18660 » mp_menus_crosssite-v4.diff

Administrator Admin, 2008-11-12 22:05

View differences:

t3lib/class.t3lib_page.php (Arbeitskopie)
$mp_row = $this->getPage($mount_info['mount_pid']); // Using "getPage" is OK since we need the check for enableFields AND for type 2 of mount pids we DO require a doktype < 200!
if (count($mp_row)) {
$row = $mp_row;
$row['_ORIG_UID'] = $origUid;
$row['_MP_PARAM'] = $mount_info['MPvar'];
} else unset($row); // If the mount point could not be fetched with respect to enableFields, unset the row so it does not become a part of the menu!
}
typo3/sysext/cms/tslib/class.tslib_menu.php (Arbeitskopie)
$overrideArray['uid'] = $this->mconf['overrideId']?$this->mconf['overrideId']:$this->menuArr[$key]['overrideId'];
$overrideArray['alias'] = '';
$MP_params = ''; // clear MP parameters since ID was changed.
} else if (isset($this->menuArr[$key]['_ORIG_UID'])) {
$overrideArray = array('uid' => $this->menuArr[$key]['_ORIG_UID']);
} else {
$overrideArray='';
}
typo3/sysext/cms/tslib/class.tslib_content.php (Arbeitskopie)
}
}
// If other domain, overwrite
if (strlen($tCR_domain) && !$enableLinksAcrossDomains) {
if (strlen($tCR_domain) && !$GLOBALS['TSFE']->config['config']['typolinkEnableLinksAcrossDomains'] && (!count($MPvarAcc) && strpos($addQueryParams, '&MP=') === false)) {
$target = isset($conf['extTarget']) ? $conf['extTarget'] : $GLOBALS['TSFE']->extTarget;
if ($conf['extTarget.']) {
$target = $this->stdWrap($target, $conf['extTarget.']);
......
$target = $forceTarget;
}
$LD = $GLOBALS['TSFE']->tmpl->linkData($page,$target,$conf['no_cache'],'','',$addQueryParams,$theTypeP);
if (strlen($tCR_domain)) {
// We will add domain only if URL does not have it already.
if (strlen($tCR_domain) && (!count($MPvarAcc) && strpos($addQueryParams, '&MP=') === false)) {
// We will add domain only if URL does not have it already and not a mount point -- they always link to the original page
if ($enableLinksAcrossDomains) {
// Get rid of the absRefPrefix if necessary. absRefPrefix is applicable only
// to the current web site. If we have domain here it means we link across
// domains. absRefPrefix can contain domain name, which will screw up
(5-5/5)