Fixed bug #11412: Using typolinkLinkAccessRestrictedPages does not take different...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5699 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 20fba42..a718a70 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-07  Steffen Kamper  <info@sk-typo3.de>
 
        * Fixed Bug #11493: Ext Js with debug setting now also deliver debug versions of adapters

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index 75d39e2..72e07ea 100644 (file)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -5612,8 +5612,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.