Fixed bug #983.
authorKarsten Dambekalns <karsten.dambekalns@typo3.org>
Mon, 18 Apr 2005 10:36:51 +0000 (10:36 +0000)
committerKarsten Dambekalns <karsten.dambekalns@typo3.org>
Mon, 18 Apr 2005 10:36:51 +0000 (10:36 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@651 709f56b5-9817-0410-a4d7-c38de5d9e867

t3lib/class.t3lib_befunc.php
typo3/sysext/viewpage/view/index.php

index cc2939e..371d39d 100755 (executable)
@@ -2189,7 +2189,7 @@ class t3lib_BEfunc        {
                                        $preUrl_temp = t3lib_BEfunc::firstDomainRecord($rootLine);
                                }
                        }
-                       $preUrl = $preUrl_temp ? 'http://'.$preUrl_temp : $backPath.'..';
+                       $preUrl = $preUrl_temp ? (t3lib_div::getIndpEnv('TYPO3_SSL') ? 'https://' : 'http://').$preUrl_temp : $backPath.'..';
                        $url = $preUrl.'/index.php?id='.$id.$addGetVars.$anchor;
                }
 
index 3ad8fda..982e706 100755 (executable)
@@ -110,7 +110,7 @@ class SC_mod_web_view_index {
                                                t3lib_BEfunc::firstDomainRecord(t3lib_BEfunc::BEgetRootLine($this->id)):
                                                "";
 
-               $this->url.= ($dName?"http://".$dName:$BACK_PATH."..")."/index.php?id=".$this->id.($this->type?"&type=".$this->type:"").$addCmd;
+               $this->url.= ($dName?(t3lib_div::getIndpEnv('TYPO3_SSL') ? 'https://' : 'http://').$dName:$BACK_PATH."..")."/index.php?id=".$this->id.($this->type?"&type=".$this->type:"").$addCmd;
                //debug($this->url);
        }