2 files changed, 2 insertions, 18 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index ce99fc05d7..d3f9417df8 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -89,22 +89,6 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
 		FROM ' . TOPICS_TABLE . " t
 		WHERE (t.forum_id = $forum_id OR t.forum_id = 0)
 			" . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . "
-			AND t.topic_type IN (" . POST_ANNOUNCE . ", " . POST_GLOBAL . ")
-			$limit_time_sql
-		ORDER BY $sort_order_sql";
-	$result = $db->sql_query($sql);
-
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$topic_rows[] = $row;
-	}
-	$db->sql_freeresult($result);
-
-	$sql = 'SELECT t.*
-		FROM ' . TOPICS_TABLE . " t
-		WHERE t.forum_id = $forum_id
-			" . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . '
-			AND t.topic_type IN (' . POST_NORMAL . ', ' . POST_STICKY . ")
 			$limit_time_sql
 		ORDER BY t.topic_type DESC, $sort_order_sql";
 	$result = $db->sql_query_limit($sql, $topics_per_page, $start);
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
index 6c2c4df406..372ccc023f 100644
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -187,8 +187,8 @@ function mcp_front_view($id, $mode, $action)
 				'IP'			=> $row['ip'],
 				'TIME'			=> $user->format_date($row['time']),
 				'ACTION'		=> $row['action'],
-				'U_VIEWTOPIC'	=> $row['viewtopic'],
-				'U_VIEWLOGS'	=> $row['viewlogs'])
+				'U_VIEWTOPIC'	=> isset($row['viewtopic']) ? $row['viewtopic'] : '',
+				'U_VIEWLOGS'	=> isset($row['viewlogs']) ? $row['viewlogs'] : '')
 			);
 		}
 	}