diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-01-07 17:04:28 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-01-07 17:04:28 +0100 |
| commit | 9e1ef9fad3b0e02ed753100943293a6ea79f67dd (patch) | |
| tree | f0fe8432b9970e2602b167b83c3d702c8d3da508 /phpBB/phpbb/install | |
| parent | 44f130808fc8ce9d125094d5294355d2b014014a (diff) | |
| parent | 830a384988587c817d9426fade09d6dd227def5d (diff) | |
| download | forums-9e1ef9fad3b0e02ed753100943293a6ea79f67dd.tar forums-9e1ef9fad3b0e02ed753100943293a6ea79f67dd.tar.gz forums-9e1ef9fad3b0e02ed753100943293a6ea79f67dd.tar.bz2 forums-9e1ef9fad3b0e02ed753100943293a6ea79f67dd.tar.xz forums-9e1ef9fad3b0e02ed753100943293a6ea79f67dd.zip | |
Merge branch 'prep-release-3.2.0' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/install')
| -rw-r--r-- | phpBB/phpbb/install/module/update_database/task/update_extensions.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/update_filesystem/task/file_check.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/install/module/update_database/task/update_extensions.php b/phpBB/phpbb/install/module/update_database/task/update_extensions.php index 13c1591dcd..b66847b243 100644 --- 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 @@ class update_extensions extends task_base $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 index 5b48350e73..47a71eb844 100644 --- 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 @@ class file_check extends task_base $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); } |