Fix singe user mode on public.php - take two

2 files changed, 6 insertions, 2 deletions

diff --git a/lib/base.php b/lib/base.php
index 02b55458f1f..7deaf271e4d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -301,7 +301,7 @@ class OC {
 		}
 	}
 
-	public static function checkSingleUserMode() {
+	public static function checkSingleUserMode($lockIfNoUserLoggedIn = false) {
 		if (!\OC::$server->getSystemConfig()->getValue('singleuser', false)) {
 			return;
 		}
@@ -311,6 +311,10 @@ class OC {
 			if ($group->inGroup($user)) {
 				return;
 			}
+		} else {
+			if(!$lockIfNoUserLoggedIn) {
+				return;
+			}
 		}
 		// send http status 503
 		header('HTTP/1.1 503 Service Temporarily Unavailable');
diff --git a/public.php b/public.php
index 8f3bc8e6ae9..f390166d06e 100644
--- a/public.php
+++ b/public.php
@@ -37,7 +37,7 @@ try {
 	}
 
 	OC::checkMaintenanceMode();
-	OC::checkSingleUserMode();
+	OC::checkSingleUserMode(true);
 	$request = \OC::$server->getRequest();
 	$pathInfo = $request->getPathInfo();