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

Fixes #2426: Changed URL creation method signatures to be consistent

Browse Source
This commit is contained in:
Alexander Makarov
2014-02-20 20:10:33 +04:00
parent 1c9cfc0105
commit 43c17d99cc
23 changed files with 84 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/helpers/BaseHtml.php
View File

@ -1489,12 +1489,10 @@ class BaseHtml
{
if (is_array($url)) {
if (isset($url[0])) {
$route = $url[0];
$params = array_splice($url, 1);
if (Yii::$app->controller instanceof \yii\web\Controller) {
return Yii::$app->controller->createUrl($route, $params);
return Yii::$app->controller->createUrl($url);
} else {
return Yii::$app->getUrlManager()->createUrl($route, $params);
return Yii::$app->getUrlManager()->createUrl($url);
}
} else {
throw new InvalidParamException('The array specifying a URL must contain at least one element.');