diff options
author | Lukas Reschke <lukas@owncloud.com> | 2015-07-19 12:14:13 +0200 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2015-07-19 12:14:13 +0200 |
commit | 1e4496c1cb779e6ceb7107301f0b0008997cc0ea (patch) | |
tree | a79e36096493f6ffb6e7112b28b90a1ed0ba98d4 /lib/private/app.php | |
parent | 1e458f186d878d51b64c8d843e356808d41bc84d (diff) | |
parent | d3b58d147fc33ec9e42ba9eee664bd03022fbbfd (diff) | |
download | nextcloud-server-1e4496c1cb779e6ceb7107301f0b0008997cc0ea.tar.gz nextcloud-server-1e4496c1cb779e6ceb7107301f0b0008997cc0ea.zip |
Merge pull request #17698 from owncloud/allow-update-of-disabled-apps
Allow upgrade of not enabled apps
Diffstat (limited to 'lib/private/app.php')
-rw-r--r-- | lib/private/app.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index 83b2e8cd760..6c6f79dfa9d 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -1162,9 +1162,7 @@ class OC_App { OC_DB::updateDbFromStructure(self::getAppPath($appId) . '/appinfo/database.xml'); } unset(self::$appVersion[$appId]); - if (!self::isEnabled($appId)) { - return false; - } + // run upgrade code if (file_exists(self::getAppPath($appId) . '/appinfo/update.php')) { self::loadApp($appId, false); include self::getAppPath($appId) . '/appinfo/update.php'; @@ -1173,15 +1171,15 @@ class OC_App { //set remote/public handlers $appData = self::getAppInfo($appId); if (array_key_exists('ocsid', $appData)) { - \OC::$server->getAppConfig()->setValue($appId, 'ocsid', $appData['ocsid']); - } elseif(\OC::$server->getAppConfig()->getValue($appId, 'ocsid', null) !== null) { - \OC::$server->getAppConfig()->deleteKey($appId, 'ocsid'); + \OC::$server->getConfig()->setAppValue($appId, 'ocsid', $appData['ocsid']); + } elseif(\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) { + \OC::$server->getConfig()->deleteAppValue($appId, 'ocsid'); } foreach ($appData['remote'] as $name => $path) { - OCP\CONFIG::setAppValue('core', 'remote_' . $name, $appId . '/' . $path); + \OC::$server->getConfig()->setAppValue('core', 'remote_' . $name, $appId . '/' . $path); } foreach ($appData['public'] as $name => $path) { - OCP\CONFIG::setAppValue('core', 'public_' . $name, $appId . '/' . $path); + \OC::$server->getConfig()->setAppValue('core', 'public_' . $name, $appId . '/' . $path); } self::setAppTypes($appId); |