Merge pull request #17942 from nextcloud/fix/noid/server-offline-app-init

pass through ServerNotAvailableException on app init
pull/17955/head
Roeland Jago Douma 7 years ago committed by GitHub
commit 3caa3c1fa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      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

Loading…
Cancel
Save