Fixes #829: loginRequired now responds with HTTP 403 in case of AJAX or loginUrl…

Fixes #829: loginRequired now responds with HTTP 403 in case of AJAX or loginUrl is not set (reverted from commit c2c12a90)

Fixes #829: loginRequired now responds with HTTP 403 in case of AJAX or loginUrl…
e1a6aacb · Alexander Makarov · c0102b41 · e1a6aacb
Commit e1a6aacb authored Aug 30, 2013 by Alexander Makarov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

User.php framework/yii/web/User.php +3 -1

No files found.
--- a/framework/yii/web/User.php
+++ b/framework/yii/web/User.php
@@ -287,8 +287,10 @@ class User extends Component
 	public function loginRequired()
 	{
 		$request = Yii::$app->getRequest();
-		if ($this->loginUrl !== null && !$request->getIsAjax()) {
+		if (!$request->getIsAjax()) {
 			$this->setReturnUrl($request->getUrl());
+		}
+		if ($this->loginUrl !== null) {
 			Yii::$app->getResponse()->redirect($this->loginUrl)->send();
 			exit();
 		} else {