]> source.dussan.org Git - nextcloud-server.git/commitdiff
Keep all shipped apps enabled because they should be okay 7888/head
authorJoas Schilling <coding@schilljs.com>
Tue, 16 Jan 2018 10:39:48 +0000 (11:39 +0100)
committerJoas Schilling <coding@schilljs.com>
Tue, 16 Jan 2018 12:41:33 +0000 (13:41 +0100)
Signed-off-by: Joas Schilling <coding@schilljs.com>
lib/private/legacy/app.php

index 1bdbd1e2a838d2b11d86ad5d2df999ec5c0fa86d..37de5fb491b4b60ba01739f68dba98989df7d0e1 100644 (file)
@@ -209,8 +209,8 @@ class OC_App {
                        require_once $app . '/appinfo/app.php';
                } catch (Error $ex) {
                        \OC::$server->getLogger()->logException($ex);
-                       $blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps();
-                       if (!in_array($app, $blacklist)) {
+                       if (!\OC::$server->getAppManager()->isShipped($app)) {
+                               // Only disable apps which are not shipped
                                self::disable($app);
                        }
                }