aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-08-11 20:37:47 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-08-11 20:37:47 +0200
commit784938e68bbf8188165fabb82ae6670d78686a4f (patch)
treed07a4cf4efff1b51f0c72b4dc082be7a6eb58005 /phpBB/memberlist.php
parentMerge branch '3.2.x' into 3.3.x (diff)
parentMerge pull request #5645 from rxu/ticket/16124 (diff)
downloadphpbb-784938e68bbf8188165fabb82ae6670d78686a4f.tar.gz
phpbb-784938e68bbf8188165fabb82ae6670d78686a4f.tar.bz2
phpbb-784938e68bbf8188165fabb82ae6670d78686a4f.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/memberlist.php')
-rw-r--r--phpBB/memberlist.php13
1 files changed, 12 insertions, 1 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 770d484d94..63817bfb15 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1132,7 +1132,18 @@ switch ($mode)
if ($active_time !== false)
{
- $sql_where .= " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . $active_time;
+ if ($active_select === 'lt' && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0)
+ {
+ $sql_where .= ' AND u.user_lastvisit = 0';
+ }
+ else if ($active_select === 'gt')
+ {
+ $sql_where .= ' AND u.user_lastvisit ' . $find_key_match[$active_select] . ' ' . $active_time;
+ }
+ else
+ {
+ $sql_where .= ' AND (u.user_lastvisit > 0 AND u.user_lastvisit < ' . $active_time . ')';
+ }
}
}