aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2014-03-05 19:09:47 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2014-03-05 19:09:47 -0600
commit43074a1b6938f3efb2b9282a25cf7beb3b1e14a6 (patch)
treebee0ebae5e265bf935b61798b5ed5fb88c3d76a5 /phpBB/includes/functions.php
parent8748032866293129b881f9b7f3f0173c1e3a646b (diff)
downloadforums-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
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php14
1 files changed, 10 insertions, 4 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);
+ }
}
/**