Merge branch 'master' of https://github.com/yiisoft/yii2

framework/db/DataReader.php

@@ -17,7 +17,8 @@ use yii\base\InvalidCallException;
  * iterating through the reader. For example,
  *
  * ~~~
- * $reader = $command->query('SELECT * FROM tbl_post');
+ * $command = $connection->createCommand('SELECT * FROM tbl_post');
+ * $reader = $command->query();
  *
  * while ($row = $reader->read()) {
  *     $rows[] = $row;

framework/web/User.php

@@ -324,9 +324,7 @@ class User extends Component
         $url = Yii::$app->getSession()->get($this->returnUrlParam, $defaultUrl);
         if (is_array($url)) {
             if (isset($url[0])) {
-                $route = array_shift($url);
-
-                return Yii::$app->getUrlManager()->createUrl($route, $url);
+                return Yii::$app->getUrlManager()->createUrl($url);
             } else {
                 $url = null;
             }