aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_prune.php5
-rw-r--r--phpBB/includes/functions_user.php9
2 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
index b10eb292d2..145c0c3854 100644
--- a/phpBB/includes/acp/acp_prune.php
+++ b/phpBB/includes/acp/acp_prune.php
@@ -333,7 +333,8 @@ class acp_prune
}
$s_group_list = '';
- $sql = 'SELECT group_id, group_name FROM ' . GROUPS_TABLE . '
+ $sql = 'SELECT group_id, group_name
+ FROM ' . GROUPS_TABLE . '
WHERE group_type <> ' . GROUP_SPECIAL . '
ORDER BY group_name ASC';
$result = $db->sql_query($sql);
@@ -403,7 +404,7 @@ class acp_prune
// so that our time range is a full day instead of 1 second
if ($joined_after == $joined_before)
{
- $joined_after[2] += 1; //$joined_after[2]++;
+ $joined_after[2] += 1;
}
$joined_sql = ' AND user_regdate BETWEEN ' . gmmktime(0, 0, 0, (int) $joined_after[1], (int) $joined_after[2], (int) $joined_after[0]) . ' AND ' . gmmktime(0, 0, 0, (int) $joined_before[1], (int) $joined_before[2], (int) $joined_before[0]);
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index e9655ba736..c78949342b 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -365,8 +365,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
// Before we begin, we will remove the reports the user issued.
$sql = 'SELECT r.post_id, p.topic_id
FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p
- WHERE ' . $db->sql_in_set('r.user_id', $user_ids) . //r.user_id = ' . $user_id . '
- '
+ WHERE ' . $db->sql_in_set('r.user_id', $user_ids) . '
AND p.post_id = r.post_id';
$result = $db->sql_query($sql);
@@ -554,13 +553,13 @@ function user_delete($mode, $user_ids, $retain_username = true)
// Change user_id to anonymous for this users triggered events
$sql = 'UPDATE ' . LOG_TABLE . '
SET user_id = ' . ANONYMOUS . '
- WHERE ' . $user_id_sql; //user_id = ' . $user_id;
+ WHERE ' . $user_id_sql;
$db->sql_query($sql);
// Delete the user_id from the zebra table
$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
- WHERE ' . $user_id_sql . //user_id = ' . $user_id . '
- ' OR ' . $db->sql_in_set('zebra_id', $user_ids);
+ WHERE ' . $user_id_sql . '
+ OR ' . $db->sql_in_set('zebra_id', $user_ids);
$db->sql_query($sql);
// Delete the user_id from the banlist