diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-24 20:48:17 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-24 20:48:17 -0500 |
| commit | e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5 (patch) | |
| tree | d51c3140655755217c8750feb290435dae1e88fc | |
| parent | 47dc492839ea44cb9aa3d0ad23f09dd2fd0b4ed9 (diff) | |
| parent | e6219c83c7302424f670d4160798db4952a48f0c (diff) | |
| download | forums-e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.tar forums-e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.tar.gz forums-e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.tar.bz2 forums-e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.tar.xz forums-e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.zip | |
Merge branch 'ticket/callumacrae/9872' into develop-olympus
* ticket/callumacrae/9872:
[ticket/9872] Removed some useless code that broke delete_posts
| -rw-r--r-- | phpBB/includes/functions_user.php | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 90341cd926..0420aa70ab 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -482,44 +482,6 @@ function user_delete($mode, $user_id, $post_username = false) include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); } - $sql = 'SELECT topic_id, COUNT(post_id) AS total_posts - FROM ' . POSTS_TABLE . " - WHERE poster_id = $user_id - GROUP BY topic_id"; - $result = $db->sql_query($sql); - - $topic_id_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $topic_id_ary[$row['topic_id']] = $row['total_posts']; - } - $db->sql_freeresult($result); - - if (sizeof($topic_id_ary)) - { - $sql = 'SELECT topic_id, topic_replies, topic_replies_real - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', array_keys($topic_id_ary)); - $result = $db->sql_query($sql); - - $del_topic_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - if (max($row['topic_replies'], $row['topic_replies_real']) + 1 == $topic_id_ary[$row['topic_id']]) - { - $del_topic_ary[] = $row['topic_id']; - } - } - $db->sql_freeresult($result); - - if (sizeof($del_topic_ary)) - { - $sql = 'DELETE FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $del_topic_ary); - $db->sql_query($sql); - } - } - // Delete posts, attachments, etc. delete_posts('poster_id', $user_id); |