aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop/merge_post_tables.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-11-10 11:24:52 +0100
committerJoas Schilling <nickvergessen@gmx.de>2012-11-10 11:24:52 +0100
commitf77a6eaab5485329a3b13922649fb8902e6e397f (patch)
tree903d9aa277fc8c015886af1f9be0a96930b0de4c /phpBB/develop/merge_post_tables.php
parent9c2a58eff4c2bd164ee3bdb2ec66729d4562963d (diff)
downloadforums-f77a6eaab5485329a3b13922649fb8902e6e397f.tar
forums-f77a6eaab5485329a3b13922649fb8902e6e397f.tar.gz
forums-f77a6eaab5485329a3b13922649fb8902e6e397f.tar.bz2
forums-f77a6eaab5485329a3b13922649fb8902e6e397f.tar.xz
forums-f77a6eaab5485329a3b13922649fb8902e6e397f.zip
[feature/soft-delete] Fix the rest of *_approved and the delete_post unit test
PHPBB3-9567
Diffstat (limited to 'phpBB/develop/merge_post_tables.php')
-rw-r--r--phpBB/develop/merge_post_tables.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/develop/merge_post_tables.php b/phpBB/develop/merge_post_tables.php
index 520591a4de..d687a292f2 100644
--- a/phpBB/develop/merge_post_tables.php
+++ b/phpBB/develop/merge_post_tables.php
@@ -162,7 +162,7 @@ while ($row = $db->sql_fetchrow($result))
$forum_id = $row['forum_id'];
$sql_ary[] = "UPDATE " . $table_prefix . "forums
- SET forum_last_poster_id = " . ((!empty($row['user_id']) && $row['user_id'] != ANONYMOUS) ? $row['user_id'] : ANONYMOUS) . ", forum_last_poster_name = '" . ((!empty($row['user_id']) && $row['user_id'] != ANONYMOUS) ? addslashes($row['username']) : addslashes($row['post_username'])) . "', forum_last_post_time = " . $row['post_time'] . ", forum_posts = " . (($post_count[$forum_id]) ? $post_count[$forum_id] : 0) . ", forum_topics = " . (($topic_count[$forum_id]) ? $topic_count[$forum_id] : 0) . "
+ SET forum_last_poster_id = " . ((!empty($row['user_id']) && $row['user_id'] != ANONYMOUS) ? $row['user_id'] : ANONYMOUS) . ", forum_last_poster_name = '" . ((!empty($row['user_id']) && $row['user_id'] != ANONYMOUS) ? addslashes($row['username']) : addslashes($row['post_username'])) . "', forum_last_post_time = " . $row['post_time'] . ", forum_posts_approved = " . (($post_count[$forum_id]) ? $post_count[$forum_id] : 0) . ", forum_topics_approved = " . (($topic_count[$forum_id]) ? $topic_count[$forum_id] : 0) . "
WHERE forum_id = $forum_id";
$sql = "SELECT t.topic_id, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_username, p2.post_username AS post_username2, p2.post_time