summaryrefslogtreecommitdiffstats
path: root/lib/private/Updater.php
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-05-24 10:14:00 +0200
committerVincent Petry <pvince81@owncloud.com>2016-05-24 10:14:00 +0200
commitee1f4602f3319f5043747a131838c334325ce03d (patch)
tree122a19aae2c4363b751997000ffde00a64b2220b /lib/private/Updater.php
parent1d1cb7932157dc0b61578c41fc9040911528fcbb (diff)
parent78da57466fad7abc2b14b4558c0ac00623a34e87 (diff)
downloadnextcloud-server-ee1f4602f3319f5043747a131838c334325ce03d.tar.gz
nextcloud-server-ee1f4602f3319f5043747a131838c334325ce03d.zip
Merge pull request #24787 from owncloud/fix-update-issue-on-master
Add the background jobs after the table was updated
Diffstat (limited to 'lib/private/Updater.php')
-rw-r--r--lib/private/Updater.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index 608b62143d3..de813b1b607 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -217,8 +217,6 @@ class Updater extends BasicEmitter {
try {
Setup::updateHtaccess();
Setup::protectDataDirectory();
- // TODO: replace with the new repair step mechanism https://github.com/owncloud/core/pull/24378
- Setup::installBackgroundJobs();
} catch (\Exception $e) {
throw new \Exception($e->getMessage());
}
@@ -244,6 +242,13 @@ class Updater extends BasicEmitter {
if ($this->updateStepEnabled) {
$this->doCoreUpgrade();
+ try {
+ // TODO: replace with the new repair step mechanism https://github.com/owncloud/core/pull/24378
+ Setup::installBackgroundJobs();
+ } catch (\Exception $e) {
+ throw new \Exception($e->getMessage());
+ }
+
// update all shipped apps
$disabledApps = $this->checkAppsRequirements();
$this->doAppUpgrade();