diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-05 19:09:47 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-05 19:09:47 -0600 |
| commit | 43074a1b6938f3efb2b9282a25cf7beb3b1e14a6 (patch) | |
| tree | bee0ebae5e265bf935b61798b5ed5fb88c3d76a5 | |
| parent | 8748032866293129b881f9b7f3f0173c1e3a646b (diff) | |
| download | forums-43074a1b6938f3efb2b9282a25cf7beb3b1e14a6.tar forums-43074a1b6938f3efb2b9282a25cf7beb3b1e14a6.tar.gz forums-43074a1b6938f3efb2b9282a25cf7beb3b1e14a6.tar.bz2 forums-43074a1b6938f3efb2b9282a25cf7beb3b1e14a6.tar.xz forums-43074a1b6938f3efb2b9282a25cf7beb3b1e14a6.zip | |
[ticket/9871] Restore phpbb_version_compare
PHPBB3-9871
| -rw-r--r-- | phpBB/includes/functions.php | 14 | ||||
| -rw-r--r-- | phpBB/phpbb/version_helper.php | 12 |
2 files changed, 11 insertions, 15 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 97e35a930b..689a682de3 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -429,11 +429,17 @@ function phpbb_email_hash($email) */ function phpbb_version_compare($version1, $version2, $operator = null) { - global $phpbb_container; - - $version_helper = $phpbb_container->get('version_helper'); + $version1 = strtolower($version1); + $version2 = strtolower($version2); - return $version_helper->compare($version1, $version2, $operator); + if (is_null($operator)) + { + return version_compare($version1, $version2); + } + else + { + return version_compare($version1, $version2, $operator); + } } /** diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index f9db731415..54c56a1b7f 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -40,17 +40,7 @@ class version_helper */ public function compare($version1, $version2, $operator = null) { - $version1 = strtolower($version1); - $version2 = strtolower($version2); - - if (is_null($operator)) - { - return version_compare($version1, $version2); - } - else - { - return version_compare($version1, $version2, $operator); - } + return phpbb_version_compare($version1, $version2, $operator); } /** |