--- typo3_src-4.6.0rc1/t3lib/class.t3lib_befunc.php 2011-10-18 13:53:48.000000000 +0200 +++ typo3_src-4.6.0rc1.patched/t3lib/class.t3lib_befunc.php 2011-10-11 15:40:48.000000000 +0200 @@ -2577,22 +2577,16 @@ $rootLine = self::BEgetRootLine($pageId); } - $protocol = t3lib_div::getIndpEnv('TYPO3_SSL') ? 'https://' : 'http://'; // checks alternate domains if (count($rootLine) > 0) { $urlParts = parse_url($domain); - if (!self::getDomainStartPage($urlParts['host'], $urlParts['path'])) { - $domain = self::firstDomainRecord($rootLine); - } // if - else - { - $dRecord = self::getDomainStartPage($urlParts['host'], $urlParts['path']); - if (isset($dRecord['domainName'])) - $domain = $dRecord['domainName']; - } // else + if (self::getDomainStartPage($urlParts['host'], $urlParts['path'])) { + $protocol = t3lib_div::getIndpEnv('TYPO3_SSL') ? 'https://' : 'http://'; + $domain = $protocol . self::firstDomainRecord($rootLine); + } } - return $protocol . $domain; + return $domain; } /**