diff options
| author | Victor Dubiniuk <victor.dubiniuk@gmail.com> | 2016-07-05 09:20:37 +0300 |
|---|---|---|
| committer | Victor Dubiniuk <victor.dubiniuk@gmail.com> | 2016-07-05 09:20:37 +0300 |
| commit | e38bbdc9fec95c77b9a307eab3fe5ff538b86b5d (patch) | |
| tree | 1e8807a971fa9e5ddf10372cd031aa2484bdfca4 /lib | |
| parent | 387ac9e0485eed0106a961cf6affc54e0d874bd4 (diff) | |
| download | nextcloud-server-e38bbdc9fec95c77b9a307eab3fe5ff538b86b5d.tar.gz nextcloud-server-e38bbdc9fec95c77b9a307eab3fe5ff538b86b5d.zip | |
Bypass upgrade page when occ controller is requested
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index 45f291e5cb7..54f865b2cad 100644 --- a/lib/base.php +++ b/lib/base.php @@ -831,10 +831,14 @@ class OC { } $request = \OC::$server->getRequest(); + // Check if requested URL matches 'index.php/occ' + $isOccControllerRequested = preg_match('|/index\.php$|', $request->getScriptName()) === 1 + && strpos($request->getPathInfo(), '/occ/') === 0; + $requestPath = $request->getRawPathInfo(); if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade self::checkMaintenanceMode($request); - self::checkUpgrade(); + $needUpgrade = self::checkUpgrade(!$isOccControllerRequested); } // emergency app disabling @@ -852,8 +856,16 @@ class OC { exit(); } - // Always load authentication apps - OC_App::loadApps(['authentication']); + try { + // Always load authentication apps + OC_App::loadApps(['authentication']); + } catch (\OC\NeedsUpdateException $e) { + if ($isOccControllerRequested && $needUpgrade){ + OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo()); + return; + } + throw $e; + } // Load minimum set of apps if (!self::checkUpgrade(false) |