summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-07-28 11:19:57 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-07-28 11:19:57 +0200
commit11214219f3e7c4261af817dd2720766285830ec1 (patch)
treed3bd097f0e55d18f75325b0eeddc23b0a4e64268
parent0aa652ecfdaf4cbb7fbb0fd49256e644f86df71e (diff)
parent6f329dcb6cc535113fb45dd07f60a075a97a6db0 (diff)
downloadnextcloud-server-11214219f3e7c4261af817dd2720766285830ec1.tar.gz
nextcloud-server-11214219f3e7c4261af817dd2720766285830ec1.zip
Merge pull request #9819 from owncloud/updater-setversionafterupdate
Set version AFTER a successful update
-rw-r--r--lib/private/updater.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/updater.php b/lib/private/updater.php
index d50c2554c75..7acd6446ec4 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -212,8 +212,6 @@ class Updater extends BasicEmitter {
\OC_DB::updateDbFromStructure(\OC::$SERVERROOT . '/db_structure.xml');
$this->emit('\OC\Updater', 'dbUpgrade');
- // TODO: why not do this at the end ?
- \OC_Config::setValue('version', implode('.', \OC_Util::getVersion()));
$disabledApps = \OC_App::checkAppsRequirements();
if (!empty($disabledApps)) {
$this->emit('\OC\Updater', 'disabledApps', array($disabledApps));
@@ -227,6 +225,9 @@ class Updater extends BasicEmitter {
//Invalidate update feed
\OC_Appconfig::setValue('core', 'lastupdatedat', 0);
+
+ // only set the final version if everything went well
+ \OC_Config::setValue('version', implode('.', \OC_Util::getVersion()));
}
}
}