diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-30 16:44:08 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-30 16:44:08 +0200 |
| commit | 9fd849b3fd846c5551c3a35ef40196687ce439cb (patch) | |
| tree | b26e1965cd3663b5b7d980289f47e55f32d3320b /phpBB | |
| parent | a824a90d5e46b5044161ec803499e5c941ef7ded (diff) | |
| parent | bd2fd4ec1d572e1ab0c63eddfdf1a99233793c20 (diff) | |
| download | forums-9fd849b3fd846c5551c3a35ef40196687ce439cb.tar forums-9fd849b3fd846c5551c3a35ef40196687ce439cb.tar.gz forums-9fd849b3fd846c5551c3a35ef40196687ce439cb.tar.bz2 forums-9fd849b3fd846c5551c3a35ef40196687ce439cb.tar.xz forums-9fd849b3fd846c5551c3a35ef40196687ce439cb.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10263] Fix comment about return value of phpbb_version_compare().
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 65e8bc251e..3281141b8e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -558,8 +558,8 @@ function phpbb_email_hash($email) * @param string $version2 Second version number * @param string $operator Comparison operator (optional) * -* @return mixed Integer (-1, 0, 1) if comparison operator is specified. -* Boolean (true, false) otherwise. +* @return mixed Boolean (true, false) if comparison operator is specified. +* Integer (-1, 0, 1) otherwise. */ function phpbb_version_compare($version1, $version2, $operator = null) { |