php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-19 18:00:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added bootstrap. form WIP

Browse Source
This commit is contained in:
Qiang Xue
2013-04-29 22:47:45 -04:00
parent 69b2b3722b
commit f5f3d2e48e
13 changed files with 9660 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
framework/helpers/base/Html.php
View File

@ -1331,7 +1331,9 @@ class Html
* If the input parameter
*
* - is an empty string: the currently requested URL will be returned;
* - is a non-empty string: it will be processed by [[Yii::getAlias()]] and returned;
* - is a non-empty string: it will first be processed by [[Yii::getAlias()]]. If the result
* is an absolute URL, it will be returned with any change further; Otherwise, the result
* will be prefixed with [[\yii\web\Request::baseUrl]] and returned.
* - is an array: the first array element is considered a route, while the rest of the name-value
* pairs are treated as the parameters to be used for URL creation using [[\yii\web\Controller::createUrl()]].
* For example: `array('post/index', 'page' => 2)`, `array('index')`.
@ -1357,7 +1359,12 @@ class Html
} elseif ($url === '') {
return Yii::$app->getRequest()->getUrl();
} else {
return Yii::getAlias($url);
$url = Yii::getAlias($url);
if ($url[0] === '/' || strpos($url, '://')) {
return $url;
} else {
return Yii::$app->getRequest()->getBaseUrl() . '/' . $url;
}
}
}