Merge branch '2.x' of github.com:cakephp/cakephp into 2.x

cakephp · Jun 29, 2016 · 7626896 · 7626896
2 parents a366ac1 + 0e97116
commit 7626896
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/Cake/Controller/Component/AuthComponent.php b/lib/Cake/Controller/Component/AuthComponent.php
@@ -359,7 +359,7 @@ protected function _unauthenticated(Controller $controller) {
 			return true;
 		}
 
-		if (!$controller->request->is('ajax')) {
+		if (!$controller->request->is('ajax') && !$controller->request->is('json')) {
 			$this->flash($this->authError);
 			$this->Session->write('Auth.redirect', $controller->request->here(false));
 			$controller->redirect($this->loginAction);