Commit 761a3bc9 authored by Qiang Xue's avatar Qiang Xue

Merge branch 'request-params-refactoring' of github.com:cebe/yii2 into...

Merge branch 'request-params-refactoring' of github.com:cebe/yii2 into cebe-request-params-refactoring

Conflicts:
	framework/CHANGELOG.md
parents 1b963420 afe50645
......@@ -100,7 +100,7 @@ class Nav extends Widget
$this->route = Yii::$app->controller->getRoute();
}
if ($this->params === null) {
$this->params = $_GET;
$this->params = Yii::$app->request->getQueryParams();
}
Html::addCssClass($this->options, 'nav');
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment