Merge pull request #26048 from owncloud/stable9.1-cath-needs-upgrade-…

…non-cli [Stable9.1] catch needs upgrade non cli
owncloud · Sep 7, 2016 · bc81af7 · bc81af7
2 parents faa6c45 + a2d01aa
commit bc81af7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/base.php b/lib/base.php
@@ -890,6 +890,12 @@ public static function handleRequest() {
 				OC_Util::setupFS();
 				OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo());
 				return;
+			} catch (\OC\NeedsUpdateException $e) {
+				if ($isOccControllerRequested && $needUpgrade){
+					OC::$server->getRouter()->match(\OC::$server->getRequest()->getRawPathInfo());
+					return;
+				}
+				throw $e;
 			} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
 				//header('HTTP/1.0 404 Not Found');
 			} catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {