Fixed bug #11824: Links accross Domains not known by linkData and therefore also...
authorOliver Hader <oliver.hader@typo3.org>
Wed, 16 Sep 2009 19:41:54 +0000 (19:41 +0000)
committerOliver Hader <oliver.hader@typo3.org>
Wed, 16 Sep 2009 19:41:54 +0000 (19:41 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5948 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index ad957ee..b6f51c3 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2009-09-16  Oliver Hader  <oliver@typo3.org>
 
        * Fixed bug #11831: Remove reference operators for objects
+       * Fixed bug #11824: Links accross Domains not known by linkData and therefore also RealURL (thanks to Daniel Poetzinger)
 
 2009-09-16  Jeff Segars  <jeff@webempoweredchurch.org>
 
index 39bbe5f..34a4552 100644 (file)
@@ -1383,10 +1383,11 @@ class t3lib_TStemplate  {
         * @param       array           Array with overriding values for the $page array.
         * @param       string          Additional URL parameters to set in the URL. Syntax is "&foo=bar&foo2=bar2" etc. Also used internally to add parameters if needed.
         * @param       string          If you set this value to something else than a blank string, then the typeNumber used in the link will be forced to this value. Normally the typeNum is based on the target set OR on $GLOBALS['TSFE']->config['config']['forceTypeValue'] if found.
+        * @param       string          The target Doamin, if any was detected in typolink 
         * @return      array           Contains keys like "totalURL", "url", "sectionIndex", "linkVars", "no_cache", "type", "target" of which "totalURL" is normally the value you would use while the other keys contains various parts that was used to construct "totalURL"
         * @see tslib_frameset::frameParams(), tslib_cObj::typoLink(), tslib_cObj::SEARCHRESULT(), TSpagegen::pagegenInit(), tslib_menu::link()
         */
-       function linkData($page,$oTarget,$no_cache,$script,$overrideArray='',$addParams='',$typeOverride='')    {
+       function linkData($page, $oTarget, $no_cache, $script, $overrideArray='', $addParams='', $typeOverride='', $targetDomain='') {
                global $TYPO3_CONF_VARS;
 
                $LD = Array();
@@ -1461,7 +1462,7 @@ class t3lib_TStemplate    {
                if (is_array($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_tstemplate.php']['linkData-PostProc']))  {
                        $_params = array(
                                                        'LD' => &$LD,
-                                                       'args' => array('page'=>$page, 'oTarget'=>$oTarget, 'no_cache'=>$no_cache, 'script'=>$script, 'overrideArray'=>$overrideArray, 'addParams'=>$addParams, 'typeOverride'=>$typeOverride),
+                                                       'args' => array('page'=>$page, 'oTarget'=>$oTarget, 'no_cache'=>$no_cache, 'script'=>$script, 'overrideArray'=>$overrideArray, 'addParams'=>$addParams, 'typeOverride'=>$typeOverride,'targetDomain'=>$targetDomain),
                                                        'typeNum' => $typeNum
                                                );
                        foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_tstemplate.php']['linkData-PostProc'] as $_funcRef)  {
index 5f67181..3aa7ee8 100644 (file)
@@ -6064,7 +6064,7 @@ class tslib_cObj {
                                                        if ($forceTarget) {
                                                                $target = $forceTarget;
                                                        }
-                                                       $LD = $GLOBALS['TSFE']->tmpl->linkData($page,$target,$conf['no_cache'],'','',$addQueryParams,$theTypeP);
+                                                       $LD = $GLOBALS['TSFE']->tmpl->linkData($page, $target, $conf['no_cache'], '', '', $addQueryParams, $theTypeP, $tCR_domain);
                                                        if (strlen($tCR_domain)) {
                                                                // We will add domain only if URL does not have it already.