Changeset 8557

Timestamp:

04/19/08 17:09:19 (1 year ago)

Author:

fabien

Message:

fixed genUrl() to always take sf_relative_url_root setting into account when building a URL

Files:

• branches/1.1/lib/controller/sfWebController.class.php (modified) (1 diff)

branches/1.1/lib/controller/sfWebController.class.php

@@ -42 +42 @@
-    }
-
-    $url = '';
-    if (!sfConfig::get('sf_no_script_name'))
-    {
-$this->context->getRequest()->getScriptName(
-
- if ($sf_relative_url_root = $this->context->getRequest()->getRelativeUrlRoot())
-
-sf_relative_url_root
+sfConfig::get('sf_relative_url_root', $this->context->getRequest()->getScriptName()
+
+
+
+this->context->getRequest()->getRelativeUrlRoot()
-    }
-