Dev: better fix for #8141: Unable to set publicurl

Dev: don't control publicurl if is set: let admin make good decision Dev: don't update getComponent('urlManager')
LimeSurvey · Oct 5, 2013 · f05f98c · f05f98c
1 parent e90e086
commit f05f98c
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/application/core/LSYii_Controller.php b/application/core/LSYii_Controller.php
@@ -150,18 +150,13 @@ public function createAbsoluteUrl($route,$params=array(),$schema='',$ampersand='
     {
         $sPublicUrl=Yii::app()->getConfig("publicurl");
         // Control if public url are really public : need scheme and host
-        // If yes: update baseUrl to config without restrictions
+        // If yes: use it directly (createUrl add index.php)
         $aPublicUrl=parse_url($sPublicUrl);
         if(isset($aPublicUrl['scheme']) && isset($aPublicUrl['host']))
         {
-            $sActualBaseUrl=Yii::app()->getComponent('urlManager')->getBaseUrl();// Keep actual url to reset after
-            Yii::app()->getComponent('urlManager')->setBaseUrl($sPublicUrl);
+            return $sPublicUrl.parent::createUrl($route,$params,$ampersand);
         }
-        $sAbsoluteUrl=parent::createAbsoluteUrl($route,$params,$schema,$ampersand);
-        if(isset($sActualBaseUrl))
-        {
-            Yii::app()->getComponent('urlManager')->setBaseUrl($sActualBaseUrl);
-        }
-        return $sAbsoluteUrl;
+        else 
+            return parent::createAbsoluteUrl($route,$params,$schema,$ampersand);
     }
 }