Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2021-05-19 13:23:00 +0300
committerGitHub <noreply@github.com>2021-05-19 13:23:00 +0300
commit7a0cd9da7c3b7a94f93bae6ac29b390781c4dea9 (patch)
treece119dc44f2c233935bc7224d73b7bebe1fe3199
parentb89f4b33f05ae827c0821158b02fae039c763cec (diff)
parenta577768aa6e98a66b5a49493f50207053368e020 (diff)
Merge pull request #27025 from nextcloud/fix/26834/refine-version-comparision
Refine version comparision for repair job for major version updates
-rw-r--r--lib/private/Repair/NC22/LookupServerSendCheck.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/Repair/NC22/LookupServerSendCheck.php b/lib/private/Repair/NC22/LookupServerSendCheck.php
index c9b79d237d0..de419c7857c 100644
--- a/lib/private/Repair/NC22/LookupServerSendCheck.php
+++ b/lib/private/Repair/NC22/LookupServerSendCheck.php
@@ -53,8 +53,9 @@ class LookupServerSendCheck implements IRepairStep {
$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
// was added to 22.0.0.3
- return version_compare($versionFromBeforeUpdate, '22.0.0.3', '<') &&
- version_compare($versionFromBeforeUpdate, '22.0.0.0', '>=');
+ return (version_compare($versionFromBeforeUpdate, '22.0.0.3', '<') && version_compare($versionFromBeforeUpdate, '22.0.0.0', '>='))
+ ||
+ (version_compare($versionFromBeforeUpdate, '21.0.1.2', '<') && version_compare($versionFromBeforeUpdate, '21.0.0.0', '>'));
}
public function run(IOutput $output): void {