diff options
| author | Julius Härtl <jus@bitgrid.net> | 2020-12-09 10:10:51 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2020-12-09 15:24:03 +0100 |
| commit | 36ffad5ba7e62783f3fb4073a6eedf1c0ca645b9 (patch) | |
| tree | 95228aad6a0243c00f7703eaabbc8b4757467600 /lib/private | |
| parent | 0befe071275c8f0f7599a883862884684e19b43a (diff) | |
| download | nextcloud-server-36ffad5ba7e62783f3fb4073a6eedf1c0ca645b9.tar.gz nextcloud-server-36ffad5ba7e62783f3fb4073a6eedf1c0ca645b9.zip | |
Make sure the migrations table schema is always checked
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Revert "Make sure the migrations table schema is always checked"
This reverts commit 258955ef738a52d9da2ac2fe59466e6093d7e9bc.
Set current vendor during upgrade and perform migrations table change if needed
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/DB/MigrationService.php | 2 | ||||
| -rw-r--r-- | lib/private/Updater.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php index 27e03318d6b..c1a6b82dccd 100644 --- a/lib/private/DB/MigrationService.php +++ b/lib/private/DB/MigrationService.php @@ -125,7 +125,7 @@ class MigrationService { return false; } - if ($this->connection->tableExists('migrations')) { + if ($this->connection->tableExists('migrations') && \OC::$server->getConfig()->getAppValue('core', 'vendor', '') !== 'owncloud') { $this->migrationTableCreated = true; return false; } diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 44f99c9e8c7..998fb4f2211 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -197,6 +197,7 @@ class Updater extends BasicEmitter { isset($allowedPreviousVersions['owncloud'][$majorMinor]) )) { $currentVendor = 'owncloud'; + $this->config->setAppValue('core', 'vendor', $currentVendor); } if ($currentVendor === 'nextcloud') { |