diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 62a025da97..fcdbd452a4 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1481,18 +1481,22 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
 			// 3: Get post count and last_post_id for each forum
 			if (sizeof($forum_ids) == 1)
 			{
-				$sql = 'SELECT COUNT(post_id) AS forum_posts, MAX(post_id) AS last_post_id
-					FROM ' . POSTS_TABLE . '
-					WHERE ' . $db->sql_in_set('forum_id', $forum_ids) . '
-						AND post_approved = 1';
+				$sql = 'SELECT COUNT(p.post_id) AS forum_posts, MAX(p.post_id) AS last_post_id
+					FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t
+					WHERE ' . $db->sql_in_set('p.forum_id', $forum_ids) . '
+						AND p.topic_id = t.topic_id
+						AND t.topic_approved = 1
+						AND p.post_approved = 1';
 			}
 			else
 			{
-				$sql = 'SELECT forum_id, COUNT(post_id) AS forum_posts, MAX(post_id) AS last_post_id
-					FROM ' . POSTS_TABLE . '
-					WHERE ' . $db->sql_in_set('forum_id', $forum_ids) . '
-						AND post_approved = 1
-					GROUP BY forum_id';
+				$sql = 'SELECT forum_id, COUNT(p.post_id) AS forum_posts, MAX(p.post_id) AS last_post_id
+					FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t
+					WHERE ' . $db->sql_in_set('p.forum_id', $forum_ids) . '
+						AND p.topic_id = t.topic_id
+						AND t.topic_approved = 1
+						AND p.post_approved = 1
+					GROUP BY p.forum_id';
 			}
 
 			$result = $db->sql_query($sql);
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 020d437b14..67aedc2f25 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -113,20 +113,33 @@ function update_post_information($type, $ids, $return_update_sql = false)
 
 	$update_sql = $empty_forums = $not_empty_forums = array();
 
-	if (sizeof($ids) == 1)
+	if ($type != 'topic')
 	{
-		$sql = 'SELECT MAX(post_id) as last_post_id
-			FROM ' . POSTS_TABLE . '
-			WHERE ' . $db->sql_in_set($type . '_id', $ids) . '
-				AND post_approved = 1';
+		$topic_join = ', ' . TOPICS_TABLE . ' t';
+		$topic_condition = 'AND t.topic_id = p.topic_id AND t.topic_approved = 1';
 	}
 	else
 	{
-		$sql = 'SELECT ' . $type . '_id, MAX(post_id) as last_post_id
-			FROM ' . POSTS_TABLE . '
-			WHERE ' . $db->sql_in_set($type . '_id', $ids) . "
-				AND post_approved = 1
-			GROUP BY {$type}_id";
+		$topic_join = '';
+		$topic_condition = '';
+	}
+
+	if (sizeof($ids) == 1)
+	{
+		$sql = 'SELECT MAX(p.post_id) as last_post_id
+			FROM ' . POSTS_TABLE . " p $topic_join
+			WHERE " . $db->sql_in_set('p.' . $type . '_id', $ids) . "
+				$topic_condition
+				AND p.post_approved = 1";
+	}
+	else
+	{
+		$sql = 'SELECT p.' . $type . '_id, MAX(p.post_id) as last_post_id
+			FROM ' . POSTS_TABLE . " p $topic_join
+			WHERE " . $db->sql_in_set('p.' . $type . '_id', $ids) . "
+				$topic_condition
+				AND p.post_approved = 1
+			GROUP BY p.{$type}_id";
 	}
 	$result = $db->sql_query($sql);