diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-09-07 20:49:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-07 20:49:32 +0300 |
| commit | 9841ede3ea13149265857c6fe93382f6f15d79d7 (patch) | |
| tree | 2c9f7f05fc4c926f05bff3df0974bfbdae65fa76 | |
| parent | 4aba0797696031fd6191340b7db95ad495d11649 (diff) | |
| parent | af76cb79209cb07df47a572ca2f477fbdca44889 (diff) | |
Merge pull request #26049 from owncloud/stable9-cath-needs-upgrade-non-cli
[Stable9] Pass web requests to occ controller if upgrade is needed
| -rw-r--r-- | lib/base.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php index e366834935e..9f7cc1858b6 100644 --- a/lib/base.php +++ b/lib/base.php @@ -906,6 +906,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) { |