Project

General

Profile

Bug #14547 » class.tslib_content.php.typolink_amp.patch

Administrator Admin, 2005-05-18 14:39

View differences:

class.tslib_content.php 2005-05-18 14:38:08.788543584 +0200
$link_param = trim($this->stdWrap($conf['parameter'],$conf['parameter.']));
$sectionMark = trim($this->stdWrap($conf['section'],$conf['section.']));
$sectionMark = $sectionMark ? '#'.$sectionMark : '';
$initP = '?id='.$GLOBALS['TSFE']->id.'&type='.$GLOBALS['TSFE']->type;
$initP = '?id='.$GLOBALS['TSFE']->id.'&type='.$GLOBALS['TSFE']->type;
$this->lastTypoLinkUrl = '';
$this->lastTypoLinkTarget = '';
if ($link_param) {
......
if ($linktxt=='') $linktxt = $link_param;
if (!$pU['scheme']) {$scheme='http://';} else {$scheme='';}
if ($GLOBALS['TSFE']->config['config']['jumpurl_enable']) {
$this->lastTypoLinkUrl = $GLOBALS['TSFE']->absRefPrefix.$GLOBALS['TSFE']->config['mainScript'].$initP.'&jumpurl='.rawurlencode($scheme.$link_param).$GLOBALS['TSFE']->getMethodUrlIdToken;
$this->lastTypoLinkUrl = $GLOBALS['TSFE']->absRefPrefix.$GLOBALS['TSFE']->config['mainScript'].$initP.'&jumpurl='.rawurlencode($scheme.$link_param).$GLOBALS['TSFE']->getMethodUrlIdToken;
} else {
$this->lastTypoLinkUrl = $scheme.$link_param;
}
......
if (@file_exists(rawurldecode($splitLinkParam[0])) || $isLocalFile) {
if ($linktxt=='') $linktxt = rawurldecode($link_param);
if ($GLOBALS['TSFE']->config['config']['jumpurl_enable']) {
$this->lastTypoLinkUrl = $GLOBALS['TSFE']->absRefPrefix.$GLOBALS['TSFE']->config['mainScript'].$initP.'&jumpurl='.rawurlencode($link_param).$GLOBALS['TSFE']->getMethodUrlIdToken;
$this->lastTypoLinkUrl = $GLOBALS['TSFE']->absRefPrefix.$GLOBALS['TSFE']->config['mainScript'].$initP.'&jumpurl='.rawurlencode($link_param).$GLOBALS['TSFE']->getMethodUrlIdToken;
} else {
$this->lastTypoLinkUrl = $GLOBALS['TSFE']->absRefPrefix.$link_param;
}
......
$addQueryParams = '';
} elseif ($conf['useCacheHash']) { // cache hashing:
$pA = t3lib_div::cHashParams($addQueryParams.$GLOBALS['TSFE']->linkVars); // Added '.$this->linkVars' dec 2003: The need for adding the linkVars is that they will be included in the link, but not the cHash. Thus the linkVars will always be the problem that prevents the cHash from working. I cannot see what negative implications in terms of incompatibilities this could bring, but for now I hope there are none. So here we go... (- kasper)
$addQueryParams.= '&cHash='.t3lib_div::shortMD5(serialize($pA));
$addQueryParams.= '&cHash='.t3lib_div::shortMD5(serialize($pA));
}
// Add "&MP" var:
if (count($MPvarAcc)) {
$addQueryParams.= '&MP='.rawurlencode(implode(',',$MPvarAcc));
$addQueryParams.= '&MP='.rawurlencode(implode(',',$MPvarAcc));
}
// If other domain, overwrite
if ($tCR_domain) {
(1-1/6)