Fix singe user mode on public.php - take two

remotes/origin/poc-doctrine-migrations
Thomas Müller 2015-04-10 11:17:33 +07:00
parent f05e19348d
commit a33edcd2f0
2 changed files with 6 additions and 2 deletions

@ -301,7 +301,7 @@ class OC {
} }
} }
public static function checkSingleUserMode() { public static function checkSingleUserMode($lockIfNoUserLoggedIn = false) {
if (!\OC::$server->getSystemConfig()->getValue('singleuser', false)) { if (!\OC::$server->getSystemConfig()->getValue('singleuser', false)) {
return; return;
} }
@ -311,6 +311,10 @@ class OC {
if ($group->inGroup($user)) { if ($group->inGroup($user)) {
return; return;
} }
} else {
if(!$lockIfNoUserLoggedIn) {
return;
}
} }
// send http status 503 // send http status 503
header('HTTP/1.1 503 Service Temporarily Unavailable'); header('HTTP/1.1 503 Service Temporarily Unavailable');

@ -37,7 +37,7 @@ try {
} }
OC::checkMaintenanceMode(); OC::checkMaintenanceMode();
OC::checkSingleUserMode(); OC::checkSingleUserMode(true);
$request = \OC::$server->getRequest(); $request = \OC::$server->getRequest();
$pathInfo = $request->getPathInfo(); $pathInfo = $request->getPathInfo();