makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/prune-users] Non-cosmetic changes per bantu's review.

Browse source 
PHPBB3-9622
This commit is contained in:
Oleg Pudeyev 2012-03-25 20:57:35 -04:00
parent 15d2f294c6
commit 953e829b52
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/acp/acp_prune.php
View file

@ -343,6 +343,7 @@ class acp_prune
{ {
$s_group_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</select>'; $s_group_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</select>';
} }
$db->sql_freeresult($result);
$template->assign_vars(array( $template->assign_vars(array(
'U_ACTION' => $this->u_action, 'U_ACTION' => $this->u_action,

11
phpBB/includes/functions_user.php
View file

@ -353,7 +353,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$user_rows[$row['user_id']] = $row; $user_rows[(int) $row['user_id']] = $row;
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -451,11 +451,10 @@ function user_delete($mode, $user_ids, $retain_username = true)
$post_username = $user_row['username']; $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 the user is inactive and newly registered
if ($user_row['user_type'] == USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_REGISTER && !$user_row['user_posts']) // 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
{ {
// When we delete these users and retain the posts, we must assign all the data to the guest user // When we delete these users and retain the posts, we must assign all the data to the guest user
$sql = 'UPDATE ' . FORUMS_TABLE . ' $sql = 'UPDATE ' . FORUMS_TABLE . '