diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-18 11:06:17 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-18 11:06:17 +0100 |
| commit | a184e350d71d6ee94d8223311e5dbb4f869b4e3a (patch) | |
| tree | 5fad3c7ee22b78fbeb438fa737b3af7e045c69ac /lib/private | |
| parent | f2724992fcb236b211f6e72aa7b3ac0dec5a7f3b (diff) | |
| parent | 911763aad50e27f5d8c667fead8e9a7f6d852a9a (diff) | |
| download | nextcloud-server-a184e350d71d6ee94d8223311e5dbb4f869b4e3a.tar.gz nextcloud-server-a184e350d71d6ee94d8223311e5dbb4f869b4e3a.zip | |
Merge remote-tracking branch 'origin/master' into filecache-extension
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/legacy/app.php | 4 | ||||
| -rw-r--r-- | lib/private/legacy/eventsource.php | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 9e47f9064d9..146262c3f95 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 diff --git a/lib/private/legacy/eventsource.php b/lib/private/legacy/eventsource.php index 1e68dd24af0..aa3d3395443 100644 --- a/lib/private/legacy/eventsource.php +++ b/lib/private/legacy/eventsource.php @@ -27,7 +27,7 @@ */ /** - * wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events) + * wrapper for server side events (https://en.wikipedia.org/wiki/Server-sent_events) * includes a fallback for older browsers and IE * * use server side events with caution, to many open requests can hang the server |