diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2022-01-07 13:11:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-07 13:11:26 +0100 |
| commit | cf46808a7fa1f1610d34e4e3dffa4512fbd851a3 (patch) | |
| tree | 3bf49dc1d9f95aaed338f8564e6a871fab530f53 | |
| parent | 5eb791a1d39dbaa169aeb38b3248f06ad591ea03 (diff) | |
| parent | 67a43a6ad441093db6191c6310d710d2bd2584d0 (diff) | |
| download | nextcloud-server-cf46808a7fa1f1610d34e4e3dffa4512fbd851a3.tar.gz nextcloud-server-cf46808a7fa1f1610d34e4e3dffa4512fbd851a3.zip | |
Merge pull request #30488 from nextcloud/backport/29780/stable21
| -rw-r--r-- | lib/private/Installer.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/private/Installer.php b/lib/private/Installer.php index 65740c32c57..2d09065be5c 100644 --- a/lib/private/Installer.php +++ b/lib/private/Installer.php @@ -159,7 +159,7 @@ class Installer { } } else { $ms = new \OC\DB\MigrationService($info['id'], \OC::$server->get(Connection::class)); - $ms->migrate('latest', true); + $ms->migrate('latest', !$previousVersion); } if ($previousVersion) { OC_App::executeRepairSteps($appId, $info['repair-steps']['post-migration']); @@ -606,6 +606,8 @@ class Installer { $appPath = OC_App::getAppPath($app); \OC_App::registerAutoloading($app, $appPath); + $config = \OC::$server->getConfig(); + if (is_file("$appPath/appinfo/database.xml")) { try { OC_DB::createDbFromStructure("$appPath/appinfo/database.xml"); @@ -617,8 +619,9 @@ class Installer { ); } } else { + $previousVersion = $config->getAppValue($app, 'installed_version', false); $ms = new \OC\DB\MigrationService($app, \OC::$server->get(Connection::class)); - $ms->migrate('latest', true); + $ms->migrate('latest', !$previousVersion); } //run appinfo/install.php @@ -632,8 +635,6 @@ class Installer { OC_App::executeRepairSteps($app, $info['repair-steps']['install']); - $config = \OC::$server->getConfig(); - $config->setAppValue($app, 'installed_version', OC_App::getAppVersion($app)); if (array_key_exists('ocsid', $info)) { $config->setAppValue($app, 'ocsid', $info['ocsid']); |