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

Merge branch 'master' of github.com:yiisoft/yii2 into 8670-multi-data-session

Browse Source
This commit is contained in:
Klimov Paul
2015-06-09 12:58:17 +03:00
parent d9d1fceef6 0c470dfb6a
commit 58760538d0
47 changed files with 811 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/web/Controller.php
View File

@@ -73,7 +73,7 @@ class Controller extends \yii\base\Controller
$name = $param->getName();
if (array_key_exists($name, $params)) {
if ($param->isArray()) {
$args[] = $actionParams[$name] = (array)$params[$name];
$args[] = $actionParams[$name] = (array) $params[$name];
} elseif (!is_array($params[$name])) {
$args[] = $actionParams[$name] = $params[$name];
} else {

4
framework/web/Request.php
View File

@@ -1224,7 +1224,7 @@ class Request extends \yii\base\Request
$cookies[$name] = new Cookie([
'name' => $name,
'value' => $data[1],
'expire'=> null
'expire' => null,
]);
}
}
@@ -1233,7 +1233,7 @@ class Request extends \yii\base\Request
$cookies[$name] = new Cookie([
'name' => $name,
'value' => $value,
'expire'=> null
'expire' => null,
]);
}
}

2
framework/web/Session.php
View File

@@ -671,7 +671,7 @@ class Session extends Component implements \IteratorAggregate, \ArrayAccess, \Co
*
* ```php
* <?php
* foreach(Yii::$app->session->getAllFlashes() as $key => $message) {
* foreach (Yii::$app->session->getAllFlashes() as $key => $message) {
* echo '<div class="alert alert-' . $key . '">' . $message . '</div>';
* } ?>
* ```

2
framework/web/User.php
View File

@@ -423,7 +423,7 @@ class User extends Component
$this->setReturnUrl($request->getUrl());
}
if ($this->loginUrl !== null) {
$loginUrl = (array)$this->loginUrl;
$loginUrl = (array) $this->loginUrl;
if ($loginUrl[0] !== Yii::$app->requestedRoute) {
return Yii::$app->getResponse()->redirect($this->loginUrl);
}