php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 22:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

URL wip

Browse Source
This commit is contained in:
Qiang Xue
2013-02-19 19:08:45 -05:00
parent e5be686849
commit e26188b34f
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
framework/web/UrlManager.php
View File

@@ -58,6 +58,14 @@ class UrlManager extends Component
* This will be passed to [[\Yii::createObject()]] to create the URL rule instances. * This will be passed to [[\Yii::createObject()]] to create the URL rule instances.
*/ */
public $defaultRuleClass = 'yii\web\UrlRule'; public $defaultRuleClass = 'yii\web\UrlRule';
/**
* @var string the base URL of the application (the part after host name and before query string).
* Make sure any ending slashes be removed. If this property is not set, it will be determined
* according to the current request. should be removed. The URLs created via [[createUrl()]] will
* be prefixed with the value of this property.
*/
public $baseUrl;
public $hostInfo;
/** /**
* Initializes the application component. * Initializes the application component.
@@ -140,13 +148,17 @@ class UrlManager extends Component
$route = trim($route, '/'); $route = trim($route, '/');
$baseUrl = $this->getBaseUrl(); if ($this->baseUrl === null) {
/** @var $request \yii\web\Request */
$request = Yii::$app->getRequest();
$this->baseUrl = $this->showScriptName || !$this->enablePrettyUrl ? $request->getScriptUrl() : $request->getBaseUrl();
}
if ($this->enablePrettyUrl) { if ($this->enablePrettyUrl) {
/** @var $rule UrlRule */ /** @var $rule UrlRule */
foreach ($this->rules as $rule) { foreach ($this->rules as $rule) {
if (($url = $rule->createUrl($this, $route, $params)) !== false) { if (($url = $rule->createUrl($this, $route, $params)) !== false) {
return $baseUrl . $url . $anchor; return $this->baseUrl . $url . $anchor;
} }
} }
@@ -156,13 +168,10 @@ class UrlManager extends Component
if ($params !== array()) { if ($params !== array()) {
$route .= '?' . http_build_query($params); $route .= '?' . http_build_query($params);
} }
return $baseUrl . '/' . $route . $anchor; return $this->baseUrl . '/' . $route . $anchor;
} else { } else {
$params[$this->routeVar] = $route; $params[$this->routeVar] = $route;
if (!$this->showScriptName) { return $this->baseUrl . '?' . http_build_query($params) . $anchor;
$baseUrl .= '/';
}
return $baseUrl . '?' . http_build_query($params) . $anchor;
} }
} }