diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-20 20:58:12 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-20 20:58:12 +0100 |
| commit | 40006376f2ca8a4ea2806d37b26cb6690df78004 (patch) | |
| tree | 8aa74e7f70e1e378b32c3dbfeacce7a74ad7a660 /phpBB | |
| parent | e66a28eb146be3944537df07e016018efee050f4 (diff) | |
| parent | 75780d7fc88590de4380f426d87cf21c9e32371b (diff) | |
| download | forums-40006376f2ca8a4ea2806d37b26cb6690df78004.tar forums-40006376f2ca8a4ea2806d37b26cb6690df78004.tar.gz forums-40006376f2ca8a4ea2806d37b26cb6690df78004.tar.bz2 forums-40006376f2ca8a4ea2806d37b26cb6690df78004.tar.xz forums-40006376f2ca8a4ea2806d37b26cb6690df78004.zip | |
Merge pull request #3226 from prototech/ticket/13420
[ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index a10b248324..59f15c4890 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -397,7 +397,7 @@ class acp_prune $joined_after = request_var('joined_after', ''); $active = request_var('active', ''); - $count = request_var('count', 0); + $count = ($request->variable('count', '') === '') ? false : $request->variable('count', 0); $active = ($active) ? explode('-', $active) : array(); $joined_before = ($joined_before) ? explode('-', $joined_before) : array(); @@ -439,7 +439,7 @@ class acp_prune $where_sql .= ($username) ? ' AND username_clean ' . $db->sql_like_expression(str_replace('*', $db->get_any_char(), utf8_clean_string($username))) : ''; $where_sql .= ($email) ? ' AND user_email ' . $db->sql_like_expression(str_replace('*', $db->get_any_char(), $email)) . ' ' : ''; $where_sql .= $joined_sql; - $where_sql .= ($count) ? " AND user_posts " . $key_match[$count_select] . ' ' . (int) $count . ' ' : ''; + $where_sql .= ($count !== false) ? " AND user_posts " . $key_match[$count_select] . ' ' . (int) $count . ' ' : ''; // First handle pruning of users who never logged in, last active date is 0000-00-00 if (sizeof($active) && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0) |