diff options
| -rw-r--r-- | phpBB/includes/acp/acp_prune.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index 145c0c3854..101eb5a1ed 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -343,6 +343,7 @@ class acp_prune { $s_group_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</select>'; } + $db->sql_freeresult($result); $template->assign_vars(array( 'U_ACTION' => $this->u_action, diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index c78949342b..09a6394323 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -353,7 +353,7 @@ function user_delete($mode, $user_ids, $retain_username = true) $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) { - $user_rows[$row['user_id']] = $row; + $user_rows[(int) $row['user_id']] = $row; } $db->sql_freeresult($result); @@ -451,11 +451,10 @@ function user_delete($mode, $user_ids, $retain_username = true) $post_username = $user_row['username']; } - // If the user is inactive and newly registered we assume no posts from the user, and save the queries - if ($user_row['user_type'] == USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_REGISTER && !$user_row['user_posts']) - { - } - else + // If the user is inactive and newly registered + // we assume no posts from the user, and save + // the queries + if ($user_row['user_type'] != USER_INACTIVE || $user_row['user_inactive_reason'] != INACTIVE_REGISTER || $user_row['user_posts']) { // When we delete these users and retain the posts, we must assign all the data to the guest user $sql = 'UPDATE ' . FORUMS_TABLE . ' |