diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-11-17 09:09:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-17 09:09:04 +0100 |
| commit | 3530e23a7a2b25b2611b5c373e9aec8e2369f7ed (patch) | |
| tree | 72b1173701609517893bd6ddd79f14490a1ed000 | |
| parent | f05e1d174911c2814f8b8e4b415a37038fc22090 (diff) | |
| parent | a9c61b4ed7057c0d0b30966504f8a35f08f4d373 (diff) | |
| download | nextcloud-server-3530e23a7a2b25b2611b5c373e9aec8e2369f7ed.tar.gz nextcloud-server-3530e23a7a2b25b2611b5c373e9aec8e2369f7ed.zip | |
Merge pull request #17952 from nextcloud/backport/17942/stable17
[stable17] pass through ServerNotAvailableException on app init
| -rw-r--r-- | lib/private/legacy/app.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 58b617aae45..0dcbadcd083 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -55,6 +55,7 @@ use OC\App\Platform; use OC\DB\MigrationService; use OC\Installer; use OC\Repair; +use OC\ServerNotAvailableException; use OCP\App\ManagerEvent; use OCP\ILogger; @@ -153,6 +154,9 @@ class OC_App { try { self::requireAppFile($app); } catch (Throwable $ex) { + if($ex instanceof ServerNotAvailableException) { + throw $ex; + } \OC::$server->getLogger()->logException($ex); if (!\OC::$server->getAppManager()->isShipped($app)) { // Only disable apps which are not shipped |