Fixed bug #11412: Using typolinkLinkAccessRestrictedPages does not take different...
authorOliver Hader <oliver.hader@typo3.org>
Wed, 8 Jul 2009 07:53:50 +0000 (07:53 +0000)
committerOliver Hader <oliver.hader@typo3.org>
Wed, 8 Jul 2009 07:53:50 +0000 (07:53 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-2@5698 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_content.php

index 59bff86..1d53673 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-08  Oliver Hader  <oliver@typo3.org>
+
+       * Fixed bug #11412: Using typolinkLinkAccessRestrictedPages does not take different domain names into account
+
 2009-07-03  Michael Stucki  <michael@typo3.org>
 
        * Release of TYPO3 4.2.8
index c661222..c563c1d 100755 (executable)
@@ -5422,8 +5422,12 @@ class tslib_cObj {
                                                                        $addParams = $GLOBALS['TSFE']->config['config']['typolinkLinkAccessRestrictedPages_addParams'];
                                                                        $addParams = str_replace('###RETURN_URL###',rawurlencode($this->lastTypoLinkUrl),$addParams);
                                                                        $addParams = str_replace('###PAGE_ID###',$page['uid'],$addParams);
-                                                                       $LD = $GLOBALS['TSFE']->tmpl->linkData($thePage,$target,'','','',$addParams,$theTypeP);
-                                                                       $this->lastTypoLinkUrl = $this->URLqMark($LD['totalURL'],'');
+                                                                       $this->lastTypoLinkUrl = $this->getTypoLink_URL(
+                                                                               $thePage['uid'] . ($theTypeP ? ',' . $theTypeP : ''),
+                                                                               $addParams,
+                                                                               $target
+                                                                       );
+                                                                       $LD = $this->lastTypoLinkLD;
                                                }
 
                                                        // Rendering the tag.