Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-09-07 09:31:56 +0300
committerGitHub <noreply@github.com>2016-09-07 09:31:56 +0300
commitbc81af74e7ec9631f0bc95940be4f38b9f7f5b3b (patch)
tree6d5047169c97fca8f9131bc0a10a839ca37aa81b /lib
parentfaa6c45089ecac36a7960a2fec7882a4a531c12b (diff)
parenta2d01aab8a1990fd7813d835865a478f5ecaf6eb (diff)
Merge pull request #26048 from owncloud/stable9.1-cath-needs-upgrade-non-cli
[Stable9.1] catch needs upgrade non cli
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php
index 1f3079b039e..9d0b1219f54 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -890,6 +890,12 @@ class OC {
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) {