summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-06-06 18:05:04 +0200
committerGitHub <noreply@github.com>2018-06-06 18:05:04 +0200
commitb49f8e43bd9077ec79547a67a09e33981713b697 (patch)
treebdece8f300cb15157ee6c4ca143836aa18517f0b /lib/private
parent55d0f355766da0896882268db8b291ada2bbd2b9 (diff)
parentbf03d43c2f65feffe96c60000a4d127411080762 (diff)
downloadnextcloud-server-b49f8e43bd9077ec79547a67a09e33981713b697.tar.gz
nextcloud-server-b49f8e43bd9077ec79547a67a09e33981713b697.zip
Merge pull request #9565 from nextcloud/feature/noid/app-settings
Migrate apps management to Vue.js
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/App/AppManager.php1
-rw-r--r--lib/private/legacy/app.php2
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index 4d0859b1988..94addb2b785 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -323,6 +323,7 @@ class AppManager implements IAppManager {
public function clearAppsCache() {
$settingsMemCache = $this->memCacheFactory->createDistributed('settings');
$settingsMemCache->clear('listApps');
+ $this->appInfos = [];
}
/**
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 70f1b16e3c6..0a5d31a9873 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -887,6 +887,7 @@ class OC_App {
}
self::registerAutoloading($appId, $appPath);
+ \OC::$server->getAppManager()->clearAppsCache();
$appData = self::getAppInfo($appId);
self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);
@@ -900,6 +901,7 @@ class OC_App {
self::executeRepairSteps($appId, $appData['repair-steps']['post-migration']);
self::setupLiveMigrations($appId, $appData['repair-steps']['live-migration']);
// update appversion in app manager
+ \OC::$server->getAppManager()->clearAppsCache();
\OC::$server->getAppManager()->getAppVersion($appId, false);
// run upgrade code