From 2e15c0d871860df4b9be55a7c67e29f76aeb8a7c Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Sat, 17 Feb 2018 15:29:15 +0100 Subject: Refactor dependencies in setAppTypes Signed-off-by: Morris Jobke --- lib/private/legacy/app.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 40af10f36fc..6ce18bc7911 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -303,8 +303,9 @@ class OC_App { /** * read app types from info.xml and cache them in the database */ - public static function setAppTypes($app) { - $appData = self::getAppInfo($app); + public static function setAppTypes(string $app) { + $appManager = \OC::$server->getAppManager(); + $appData = $appManager->getAppInfo($app); if(!is_array($appData)) { return; } @@ -316,12 +317,13 @@ class OC_App { $appData['types'] = []; } - \OC::$server->getConfig()->setAppValue($app, 'types', $appTypes); + $config = \OC::$server->getConfig(); + $config->setAppValue($app, 'types', $appTypes); - if (\OC::$server->getAppManager()->hasProtectedAppType($appData['types'])) { - $enabled = \OC::$server->getConfig()->getAppValue($app, 'enabled', 'yes'); + if ($appManager->hasProtectedAppType($appData['types'])) { + $enabled = $config->getAppValue($app, 'enabled', 'yes'); if ($enabled !== 'yes' && $enabled !== 'no') { - \OC::$server->getConfig()->setAppValue($app, 'enabled', 'yes'); + $config->setAppValue($app, 'enabled', 'yes'); } } } -- cgit v1.2.3