From 4782b9234724297cb5c08da2f055060d67c0b51c Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 7 Jul 2016 12:07:35 +0200
Subject: [PATCH] Revert "Bypass upgrade page when occ controller is requested
 (#25363)"

This reverts commit 445a76bb1b0249a642a9a3f2e400c1221be7993f.
---
 lib/base.php | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index df1fa61b74..def9d64b4a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -932,14 +932,10 @@ 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);
-			$needUpgrade = self::checkUpgrade(!$isOccControllerRequested);
+			self::checkUpgrade();
 		}
 
 		// emergency app disabling
@@ -957,16 +953,8 @@ class OC {
 			exit();
 		}
 
-		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;
-		}
+		// Always load authentication apps
+		OC_App::loadApps(['authentication']);
 
 		// Load minimum set of apps
 		if (!self::checkUpgrade(false)