--- typo3_src-3.8.0.orig/tslib/class.tslib_content.php 2005-05-23 02:41:24.000000000 +0200 +++ typo3_src-3.8.0.ATagParams-stdWrap/tslib/class.tslib_content.php 2005-10-31 15:48:34.320990048 +0100 @@ -2444,7 +2444,7 @@ .'&NP[offsite_thumb][1]='.rawurlencode($thumbFile); $linkCObject = $this->cObjGetSingle($conf['cObject'],$conf['cObject.']); if ($linkCObject) { - $ATagParams = trim($conf['ATagParams']) ? ' '.trim($conf['ATagParams']) : ''; + $ATagParams = $this->getATagParams($conf); $linkCObject=''.$linkCObject.''; $linkCObject=$this->stdWrap($linkCObject,$conf['outerStdWrap.']); if ($conf['before']) { @@ -2676,6 +2676,27 @@ return $altParam; } + /** + * An abstraction method to add parameters to an A tag. + * Uses the ATagParams property. + * + * @param array TypoScript configuration properties + * @param boolean If set, will add the global config.ATagParams to the link + * @return string String containing the parameters to the A tag (if non empty, with a leading space) + * @see IMGTEXT(), filelink(), makelinks(), typolink() + */ + function getATagParams($conf, $addGlobal=1) { + $aTagParams = ''; + if ($conf['ATagParams.']) { + $aTagParams = ' '.$this->stdWrap($conf['ATagParams'], $conf['ATagParams.']); + } else if ($conf['ATagParams']) { + $aTagParams = ' '.$conf['ATagParams']; + } + if ($addGlobal) { + $aTagParams = ' '.trim($GLOBALS['TSFE']->ATagParams.$aTagParams); + } + return $aTagParams; + } @@ -3704,7 +3725,7 @@ */ function filelink($theValue, $conf) { $output = ''; - $aTagParams = $GLOBALS['TSFE']->ATagParams.($conf['ATagParams']?' '.$conf['ATagParams']:''); + $aTagParams = $this->getATagParams($conf); $initP = '?id='.$GLOBALS['TSFE']->id.'&type='.$GLOBALS['TSFE']->type; $conf['path'] = $this->stdWrap($conf['path'],$conf['path.']); $theFile = trim($conf['path']).$theValue; @@ -4303,7 +4324,7 @@ * @see _parseFunc() */ function http_makelinks($data,$conf) { - $aTagParams = $GLOBALS['TSFE']->ATagParams.($conf['ATagParams']?' '.$conf['ATagParams']:''); + $aTagParams = $this->getATagParams($conf); $textpieces = explode('http://', $data); $pieces = count($textpieces); $textstr = $textpieces[0]; @@ -4371,7 +4392,7 @@ */ function mailto_makelinks($data,$conf) { // http-split - $aTagParams = $GLOBALS['TSFE']->ATagParams.($conf['ATagParams']?' '.$conf['ATagParams']:''); + $aTagParams = $this->getATagParams($conf); $textpieces = explode('mailto:', $data); $pieces = count($textpieces); $textstr = $textpieces[0]; @@ -4840,7 +4861,7 @@ */ function typoLink($linktxt, $conf) { $finalTagParts = array(); - $finalTagParts['aTagParams'] = $GLOBALS['TSFE']->ATagParams.($conf['ATagParams']?' '.$conf['ATagParams']:''); + $finalTagParts['aTagParams'] = $this->getATagParams($conf); $link_param = trim($this->stdWrap($conf['parameter'],$conf['parameter.'])); $sectionMark = trim($this->stdWrap($conf['section'],$conf['section.'])); --- typo3_src-3.8.0.orig/tslib/class.tslib_menu.php 2005-05-23 02:41:24.000000000 +0200 +++ typo3_src-3.8.0.ATagParams-stdWrap/tslib/class.tslib_menu.php 2005-10-31 15:48:57.984534315 +0100 @@ -1530,7 +1530,7 @@ $this->I['spacer'] = $this->menuArr[$key]['isSpacer']; // Make link tag - $this->I['val']['ATagParams'] = $this->I['val']['ATagParams'] ? ' '.$this->I['val']['ATagParams'] : ''; + $this->I['val']['ATagParams'] = $this->WMcObj->getATagParams($this->I['val'], 0); $this->I['linkHREF'] = $this->link($key,$this->I['val']['altTarget'],$this->mconf['forceTypeValue']); // Title attribute of links: