[prep-release-3.2.0] Correctly compare extensions version

marc1706 · marc1706 · commit 9bbd034a4e81 · 2017-01-07T14:44:04.000+01:00
diff --git a/phpBB/phpbb/install/module/update_database/task/update_extensions.php b/phpBB/phpbb/install/module/update_database/task/update_extensions.php
@@ -138,7 +138,7 @@ public function run()
 			$default_update_extensions = [];
 			foreach (self::$default_extensions_update as $version => $extensions)
 			{
-				if ($this->update_helper->phpbb_version_compare($version_from, $version, '<='))
+				if ($this->update_helper->phpbb_version_compare($version_from, $version, '<'))
 				{
 					$default_update_extensions = array_merge($default_update_extensions, $extensions);
 				}
diff --git a/phpBB/phpbb/install/module/update_filesystem/task/file_check.php b/phpBB/phpbb/install/module/update_filesystem/task/file_check.php
@@ -123,7 +123,7 @@ function ($filename) use ($root_path)
 		$default_update_extensions = [];
 		foreach (\phpbb\install\module\update_database\task\update_extensions::$default_extensions_update as $version => $extensions)
 		{
-			if ($this->update_helper->phpbb_version_compare($update_info['version']['from'], $version, '>'))
+			if ($this->update_helper->phpbb_version_compare($update_info['version']['from'], $version, '>='))
 			{
 				$default_update_extensions = array_merge($default_update_extensions, $extensions);
 			}

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function run()`
`138`	`138`	`$default_update_extensions = [];`
`139`	`139`	`foreach (self::$default_extensions_update as $version => $extensions)`
`140`	`140`	`{`
`141`		`- if ($this->update_helper->phpbb_version_compare($version_from, $version, '<='))`
	`141`	`+ if ($this->update_helper->phpbb_version_compare($version_from, $version, '<'))`
`142`	`142`	`{`
`143`	`143`	`$default_update_extensions = array_merge($default_update_extensions, $extensions);`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ function ($filename) use ($root_path)`
`123`	`123`	`$default_update_extensions = [];`
`124`	`124`	`foreach (\phpbb\install\module\update_database\task\update_extensions::$default_extensions_update as $version => $extensions)`
`125`	`125`	`{`
`126`		`- if ($this->update_helper->phpbb_version_compare($update_info['version']['from'], $version, '>'))`
	`126`	`+ if ($this->update_helper->phpbb_version_compare($update_info['version']['from'], $version, '>='))`
`127`	`127`	`{`
`128`	`128`	`$default_update_extensions = array_merge($default_update_extensions, $extensions);`
`129`	`129`	`}`