aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-05-08 13:28:09 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2011-05-08 13:28:09 -0400
commit9f32cae5f9b4e3524dd82be266ed638152920ebb (patch)
tree253bf89b12902ec66a83b4294bf1c0a243341a81 /phpBB/includes/functions_user.php
parente23868f3e2e95ea5b6bc5d4a14fc48f8bce99615 (diff)
downloadforums-9f32cae5f9b4e3524dd82be266ed638152920ebb.tar
forums-9f32cae5f9b4e3524dd82be266ed638152920ebb.tar.gz
forums-9f32cae5f9b4e3524dd82be266ed638152920ebb.tar.bz2
forums-9f32cae5f9b4e3524dd82be266ed638152920ebb.tar.xz
forums-9f32cae5f9b4e3524dd82be266ed638152920ebb.zip
[feature/prune_users] Moved set_config_count out of user loop.
PHPBB3-9622
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 2ac8ff0eec..e9655ba736 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -422,6 +422,8 @@ function user_delete($mode, $user_ids, $retain_username = true)
// Remove reports
$db->sql_query('DELETE FROM ' . REPORTS_TABLE . ' WHERE ' . $user_id_sql);
+ $num_users_delta = 0;
+
// Some things need to be done in the loop (if the query changes based
// on which user is currently being deleted)
$added_guest_posts = 0;
@@ -435,7 +437,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
// Decrement number of users if this user is active
if ($user_row['user_type'] != USER_INACTIVE && $user_row['user_type'] != USER_IGNORE)
{
- set_config_count('num_users', -1, true);
+ --$num_users_delta;
}
switch ($mode)
@@ -492,6 +494,11 @@ function user_delete($mode, $user_ids, $retain_username = true)
}
}
+ if ($num_users_delta != 0)
+ {
+ set_config_count('num_users', $num_users_delta, true);
+ }
+
// Now do the invariant tasks
// all queries performed in one call of this function are in a single transaction
// so this is kosher