wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9819 from owncloud/updater-setversionafterupdate

Browse source 
Set version AFTER a successful update
This commit is contained in:
Thomas Müller 2014-07-28 11:19:57 +02:00
commit 11214219f3
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/updater.php
View file

@ -212,8 +212,6 @@ class Updater extends BasicEmitter {
\OC_DB::updateDbFromStructure(\OC::$SERVERROOT . '/db_structure.xml'); \OC_DB::updateDbFromStructure(\OC::$SERVERROOT . '/db_structure.xml');
$this->emit('\OC\Updater', 'dbUpgrade'); $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(); $disabledApps = \OC_App::checkAppsRequirements();
if (!empty($disabledApps)) { if (!empty($disabledApps)) {
$this->emit('\OC\Updater', 'disabledApps', array($disabledApps)); $this->emit('\OC\Updater', 'disabledApps', array($disabledApps));
@ -227,6 +225,9 @@ class Updater extends BasicEmitter {
//Invalidate update feed //Invalidate update feed
\OC_Appconfig::setValue('core', 'lastupdatedat', 0); \OC_Appconfig::setValue('core', 'lastupdatedat', 0);
// only set the final version if everything went well
\OC_Config::setValue('version', implode('.', \OC_Util::getVersion()));
} }
} }
} }