From d80cf632b68ebed73f16dd440d81a7af867e444f Mon Sep 17 00:00:00 2001 From: pherum83 Date: Sun, 12 Feb 2012 22:18:59 +0000 Subject: [PATCH] r374 TRUNCATE `bb_posts_html`; git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@374 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/config.php | 4 ++-- upload/includes/functions_admin.php | 33 +++++++++++++++-------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/upload/config.php b/upload/config.php index 1ddbdf2bf..76a933350 100644 --- a/upload/config.php +++ b/upload/config.php @@ -52,8 +52,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.4 (beta)'; -$bb_cfg['tp_release_state'] = 'R373'; -$bb_cfg['tp_release_date'] = '12-02-2012'; +$bb_cfg['tp_release_state'] = 'R374'; +$bb_cfg['tp_release_date'] = '13-02-2012'; // Database $charset = 'utf8'; diff --git a/upload/includes/functions_admin.php b/upload/includes/functions_admin.php index ab94982e1..d5676175c 100644 --- a/upload/includes/functions_admin.php +++ b/upload/includes/functions_admin.php @@ -353,12 +353,12 @@ function topic_delete ($mode_or_topic_id, $forum_id = null, $prune_time = 0, $pr // Delete posts, posts_text, attachments (from DB) DB()->query(" DELETE p, pt, ps, a, d, ph - FROM ". $tmp_delete_posts ." del - LEFT JOIN ". BB_POSTS ." p ON(p.post_id = del.post_id) - LEFT JOIN ". BB_POSTS_TEXT ." pt ON(pt.post_id = del.post_id) - LEFT JOIN ". BB_POSTS_HTML ." ph ON(ph.post_id = del.post_id) - LEFT JOIN ". BB_POSTS_SEARCH ." ps ON(ps.post_id = del.post_id) - LEFT JOIN ". BB_ATTACHMENTS ." a ON(a.post_id = del.post_id) + FROM ". $tmp_delete_topics ." del + LEFT JOIN ". BB_POSTS ." p ON(p.topic_id = del.topic_id) + LEFT JOIN ". BB_POSTS_TEXT ." pt ON(pt.post_id = p.post_id) + LEFT JOIN ". BB_POSTS_HTML ." ph ON(ph.post_id = p.post_id) + LEFT JOIN ". BB_POSTS_SEARCH ." ps ON(ps.post_id = p.post_id) + LEFT JOIN ". BB_ATTACHMENTS ." a ON(a.post_id = p.post_id) LEFT JOIN ". BB_ATTACHMENTS_DESC ." d ON(d.attach_id = a.attach_id) "); @@ -729,16 +729,17 @@ function post_delete ($mode_or_post_id, $user_id = null, $exclude_first = true) unset($row, $result); // Delete posts, posts_text, attachments (from DB) - DB()->query(" - DELETE p, pt, ps, tor, a, d - FROM ". $tmp_delete_posts ." del - LEFT JOIN ". BB_POSTS ." p ON(p.post_id = del.post_id) - LEFT JOIN ". BB_POSTS_TEXT ." pt ON(pt.post_id = del.post_id) - LEFT JOIN ". BB_POSTS_SEARCH ." ps ON(ps.post_id = del.post_id) - LEFT JOIN ". BB_BT_TORRENTS ." tor ON(tor.post_id = del.post_id) - LEFT JOIN ". BB_ATTACHMENTS ." a ON(a.post_id = del.post_id) - LEFT JOIN ". BB_ATTACHMENTS_DESC ." d ON(d.attach_id = a.attach_id) - "); + DB()->query(" + DELETE p, pt, ps, tor, a, d, ph + FROM ". $tmp_delete_posts ." del + LEFT JOIN ". BB_POSTS ." p ON(p.post_id = del.post_id) + LEFT JOIN ". BB_POSTS_TEXT ." pt ON(pt.post_id = del.post_id) + LEFT JOIN ". BB_POSTS_HTML ." ph ON(ph.post_id = del.post_id) + LEFT JOIN ". BB_POSTS_SEARCH ." ps ON(ps.post_id = del.post_id) + LEFT JOIN ". BB_BT_TORRENTS ." tor ON(tor.post_id = del.post_id) + LEFT JOIN ". BB_ATTACHMENTS ." a ON(a.post_id = del.post_id) + LEFT JOIN ". BB_ATTACHMENTS_DESC ." d ON(d.attach_id = a.attach_id) + "); // Log action if ($del_user_posts)