Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSON

Show login again instead of JSON if CSRF check fails
12 years ago · 17f97ea2ca
parent 3da6b3b533 4893d2c0ed
commit 17f97ea2ca
1 changed files with 3 additions and 1 deletions
--- a/lib/base.php
+++ b/lib/base.php
@ -921,7 +921,9 @@ class OC {
 			return false;
 		}

-		OC_JSON::callCheck();
+		if(!OC_Util::isCallRegistered()) {
+			return false;
+		}
 		OC_App::loadApps();

 		//setup extra user backends