diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-03-20 23:12:48 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-03-20 23:12:48 +0100 |
| commit | 5cc861712849392b8083577e3246803dbc95da4a (patch) | |
| tree | 1a170593480b8c0cc3e634f193fd064addf0faab | |
| parent | ce92724514f48a92cd88ada0c38e30fd7fa78404 (diff) | |
| parent | 634392aa1b78881d0a59df5112c8e1aee58118df (diff) | |
| download | forums-5cc861712849392b8083577e3246803dbc95da4a.tar forums-5cc861712849392b8083577e3246803dbc95da4a.tar.gz forums-5cc861712849392b8083577e3246803dbc95da4a.tar.bz2 forums-5cc861712849392b8083577e3246803dbc95da4a.tar.xz forums-5cc861712849392b8083577e3246803dbc95da4a.zip | |
Merge branch 'ticket/10021-develop' into develop
* ticket/10021-develop:
[ticket/10021] Adjust ticket/10021 for develop
| -rw-r--r-- | phpBB/memberlist.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index a0e7d91875..b5eb3312dd 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1079,14 +1079,9 @@ switch ($mode) if (isset($find_key_match[$joined_select]) && sizeof($joined) == 3) { - // Before PHP 5.1 an error value -1 can be returned instead of false. - // Theoretically gmmktime() can also legitimately return -1 as an actual timestamp. - // But since we do not pass the $second parameter to gmmktime(), - // an actual unix timestamp -1 cannot be returned in this case. - // Thus we can check whether it is -1 and treat -1 as an error. $joined_time = gmmktime(0, 0, 0, (int) $joined[1], (int) $joined[2], (int) $joined[0]); - if ($joined_time !== false && $joined_time !== -1) + if ($joined_time !== false) { $sql_where .= " AND u.user_regdate " . $find_key_match[$joined_select] . ' ' . $joined_time; } @@ -1096,7 +1091,7 @@ switch ($mode) { $active_time = gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]); - if ($active_time !== false && $active_time !== -1) + if ($active_time !== false) { $sql_where .= " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . $active_time; } |