diff options
| -rw-r--r-- | lib/private/app.php | 19 | ||||
| -rw-r--r-- | lib/private/appconfig.php | 13 |
2 files changed, 11 insertions, 21 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index f49db15defe..2abc015a91f 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -1024,21 +1024,12 @@ class OC_App { */ public static function getAppVersions() { static $versions; - if (isset($versions)) { // simple cache, needs to be fixed - return $versions; // when function is used besides in checkUpgrade - } - $versions = array(); - try { - $query = OC_DB::prepare('SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig`' - . ' WHERE `configkey` = \'installed_version\''); - $result = $query->execute(); - while ($row = $result->fetchRow()) { - $versions[$row['appid']] = $row['configvalue']; - } - return $versions; - } catch (\Exception $e) { - return array(); + + if(!$versions) { + $appConfig = \OC::$server->getAppConfig(); + $versions = $appConfig->getValues(false, 'installed_version'); } + return $versions; } diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php index cd3362e0091..035495992ef 100644 --- a/lib/private/appconfig.php +++ b/lib/private/appconfig.php @@ -251,14 +251,13 @@ class AppConfig implements IAppConfig { if ($key === false) { return $this->getAppValues($app); } else { - $configs = []; - foreach ($this->getApps() as $appId) { - if ($this->hasKey($appId, $key)) { - $configs[$appId] = $this->getValue($appId, $key); - } - } + $appIds = $this->getApps(); + $values = array_map(function($appId) use ($key) { + return isset($this->cache[$appId][$key]) ? $this->cache[$appId][$key] : null; + }, $appIds); + $result = array_combine($appIds, $values); - return $configs; + return array_filter($result); } } |