aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_inactive.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2012-11-09 11:47:21 +0100
committerNils Adermann <naderman@naderman.de>2012-11-09 11:47:21 +0100
commit128eae72171838f689bb1bddba15e0e486325abc (patch)
treede3d9415e386c4368e31192ee2600e3980200a1d /phpBB/includes/acp/acp_inactive.php
parent5d37c171c2c47be5e718b9a5e961a365c8f02f19 (diff)
parent443af0ad5679c054502a0b5a8ec778c1bbd9e9d0 (diff)
downloadforums-128eae72171838f689bb1bddba15e0e486325abc.tar
forums-128eae72171838f689bb1bddba15e0e486325abc.tar.gz
forums-128eae72171838f689bb1bddba15e0e486325abc.tar.bz2
forums-128eae72171838f689bb1bddba15e0e486325abc.tar.xz
forums-128eae72171838f689bb1bddba15e0e486325abc.zip
Merge remote-tracking branch 'github-p/feature/prune-users' into develop
* github-p/feature/prune-users: (21 commits) [feature/prune-users] $author_id_sql is no longer needed here. [feature/prune-users] Move quote to the correct line. [feature/prune-users] Split one line into two lines for readability. [feature/prune-users] Use empty for checking array size. [feature/prune-users] Fix issues with queries pointed out by bantu. [feature/prune-users] Add spaces inside brackets. [feature/prune-users] Use a map instead of performing array scans. [feature/prune-users] Fix incorrect condition when deleting log entries. [feature/prune-users] Non-cosmetic changes per bantu's review. [feature/prune-users] Cosmetic changes per bantu's review. [feature/prune-users] Minor UI adjustment and bug fixes [feature/prune_users] Moved set_config_count out of user loop. [feature/prune-users] Fixed user id check in undelivered users loop. [feature/prune-users] Call sql_is_set once for author ids in user_delete. [feature/prune-users] Replaced missed occurrences of $user_id with $user_ids. [feature/prune-users] Call sql_is_set for user ids once in user_delete. [feature/prune-users] Fixed whitespace in language file. [feature/prune-users] Apply 904bcb86a054ab6256da565098eb9bd8ab20414b. [feature/prune-users] Adjust some language strings for new features [feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5. ...
Diffstat (limited to 'phpBB/includes/acp/acp_inactive.php')
-rw-r--r--phpBB/includes/acp/acp_inactive.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php
index bf7a9e11e4..e61115f681 100644
--- a/phpBB/includes/acp/acp_inactive.php
+++ b/phpBB/includes/acp/acp_inactive.php
@@ -155,10 +155,7 @@ class acp_inactive
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
}
- foreach ($mark as $user_id)
- {
- user_delete('retain', $user_id, $user_affected[$user_id]);
- }
+ user_delete('retain', $mark, true);
add_log('admin', 'LOG_INACTIVE_' . strtoupper($action), implode(', ', $user_affected));