mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 22:40:39 +02:00
Code Issues Releases Wiki Activity

[ticket/9871] Restore phpbb_version_compare

Browse Source 
PHPBB3-9871
This commit is contained in:
Nathan Guse
2014-03-05 19:09:47 -06:00
parent 8748032866
commit 43074a1b69
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/includes/functions.php
View File

@@ -429,11 +429,17 @@ function phpbb_email_hash($email)
*/ */
function phpbb_version_compare($version1, $version2, $operator = null) function phpbb_version_compare($version1, $version2, $operator = null)
{ {
global $phpbb_container; $version1 = strtolower($version1);
$version2 = strtolower($version2);
$version_helper = $phpbb_container->get('version_helper'); if (is_null($operator))
{
return $version_helper->compare($version1, $version2, $operator); return version_compare($version1, $version2);
}
else
{
return version_compare($version1, $version2, $operator);
}
} }
/** /**

12
phpBB/phpbb/version_helper.php
View File

@@ -40,17 +40,7 @@ class version_helper
*/ */
public function compare($version1, $version2, $operator = null) public function compare($version1, $version2, $operator = null)
{ {
$version1 = strtolower($version1); return phpbb_version_compare($version1, $version2, $operator);
$version2 = strtolower($version2);
if (is_null($operator))
{
return version_compare($version1, $version2);
}
else
{
return version_compare($version1, $version2, $operator);
}
} }
/** /**