diff options
author | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-07-18 00:17:20 +0200 |
---|---|---|
committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-07-18 00:17:20 +0200 |
commit | 1e0775a3da44d042949415c92c0ae18d8be4da7c (patch) | |
tree | c33dfabe2e4969191934560a4a9027d8fafca543 /phpBB/includes/functions_user.php | |
parent | 42477861a45935b10285a1434f4ffaf5b199c5c2 (diff) | |
parent | da6b378e64d2457ddbcd299d769ecf0167ffb9c8 (diff) | |
download | forums-1e0775a3da44d042949415c92c0ae18d8be4da7c.tar forums-1e0775a3da44d042949415c92c0ae18d8be4da7c.tar.gz forums-1e0775a3da44d042949415c92c0ae18d8be4da7c.tar.bz2 forums-1e0775a3da44d042949415c92c0ae18d8be4da7c.tar.xz forums-1e0775a3da44d042949415c92c0ae18d8be4da7c.zip |
Merge branch 'ticket/10729' into ticket/10729-2
Conflicts:
phpBB/includes/functions_user.php
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r-- | phpBB/includes/functions_user.php | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index d39be50251..c767816d30 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -555,11 +555,6 @@ function user_delete($mode, $user_ids, $retain_username = true) WHERE ' . $db->sql_in_set('poster_id', $user_ids); $db->sql_query($sql); - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_edit_user = ' . ANONYMOUS . ' - WHERE ' . $db->sql_in_set('post_edit_user', $user_ids); - $db->sql_query($sql); - $sql = 'UPDATE ' . USERS_TABLE . ' SET user_posts = user_posts + ' . $added_guest_posts . ' WHERE user_id = ' . ANONYMOUS; @@ -589,6 +584,18 @@ function user_delete($mode, $user_ids, $retain_username = true) $cache->destroy('sql', MODERATOR_CACHE_TABLE); + // Change user_id to anonymous for posts edited by this user + $sql = 'UPDATE ' . POSTS_TABLE . ' + SET post_edit_user = ' . ANONYMOUS . ' + WHERE ' . $db->sql_in_set('post_edit_user', $user_ids); + $db->sql_query($sql); + + // Change user_id to anonymous for pms edited by this user + $sql = 'UPDATE ' . PRIVMSGS_TABLE . ' + SET message_edit_user = ' . ANONYMOUS . ' + WHERE ' . $db->sql_in_set('message_edit_user', $user_ids); + $db->sql_query($sql); + // Delete user log entries about this user $sql = 'DELETE FROM ' . LOG_TABLE . ' WHERE ' . $db->sql_in_set('reportee_id', $user_ids); |