mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-04 15:57:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/10021-develop' into develop

Browse Source 
* ticket/10021-develop:
  [ticket/10021] Adjust ticket/10021 for develop
This commit is contained in:
Igor Wiedler
2011-03-20 23:12:48 +01:00
parent ce92724514 634392aa1b
commit 5cc8617128
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/memberlist.php
View File

@@ -1079,14 +1079,9 @@ switch ($mode)
if (isset($find_key_match[$joined_select]) && sizeof($joined) == 3) 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]); $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; $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]); $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; $sql_where .= " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . $active_time;
} }