5 files changed, 65 insertions, 71 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'] : '')
 			);
 		}
 	}
diff --git a/phpBB/styles/subSilver/template/mcp_forum.html b/phpBB/styles/subSilver/template/mcp_forum.html
index 834e7852e5..18f3f8884a 100644
--- a/phpBB/styles/subSilver/template/mcp_forum.html
+++ b/phpBB/styles/subSilver/template/mcp_forum.html
@@ -1,60 +1,66 @@
 <!-- INCLUDE mcp_header.html -->
 
-		<!-- $Id$ -->
+<!-- $Id$ -->
 
-		<!-- IF U_VIEW_FORUM_LOGS --><a href="{U_VIEW_FORUM_LOGS}">{L_VIEW_FORUM_LOGS}</a><!-- ENDIF -->
+<!-- IF U_VIEW_FORUM_LOGS --><a href="{U_VIEW_FORUM_LOGS}">{L_VIEW_FORUM_LOGS}</a><!-- ENDIF -->
 
-		<form method="post" name="mcp" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1">
-			<tr>
-				<td class="cat" colspan="6" align="center"><span class="gensmall">{L_DISPLAY_TOPICS}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
-			</tr>
-			<tr>
-				<th width="4%" nowrap="nowrap">&nbsp;</th>
-				<th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
-				<th width="8%" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
-				<th width="17%" nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
-				<th width="5%" nowrap="nowrap">&nbsp;{L_MARK}&nbsp;</th>
-			</tr>
-			<!-- BEGIN topicrow -->
-			<tr>
-				<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
-				<!-- IF S_TOPIC_ICONS -->
-				<!-- td class="row1" width="25" align="center">{topicrow.TOPIC_ICON_IMG}</td -->
-				<!-- ENDIF -->
-				<td class="row1">
-					<!-- IF topicrow.S_SELECT_TOPIC -->
-						<span class="genmed">[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ]&nbsp;</span>
-					<!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_UNAPPROVED -->
-						<a href="{topicrow.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a>&nbsp;
-					<!-- ENDIF -->
-					<!-- IF topicrow.S_TOPIC_REPORTED -->
-						<a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;
-					<!-- ENDIF -->
-					<p class="topictitle">{topicrow.NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p>
-				</td>
-				<td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td>
-				<td class="row1" width="120" align="center"><p class="topicdetails">{topicrow.LAST_POST_TIME}</p></td>
-				<td class="row2" align="center"><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}" {topicrow.S_TOPIC_CHECKED}/></td>
+<form method="post" name="mcp" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1">
+	<tr>
+		<td class="cat" colspan="6" align="center"><span class="gensmall">{L_DISPLAY_TOPICS}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></span></td>
+	</tr>
+	<tr>
+		<th width="4%" nowrap="nowrap">&nbsp;</th>
+		<th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
+		<th width="8%" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
+		<th width="17%" nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
+		<th width="5%" nowrap="nowrap">&nbsp;{L_MARK}&nbsp;</th>
+	</tr>
+	<!-- BEGIN topicrow -->
+	<tr>
+		<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
+		<!-- IF S_TOPIC_ICONS -->
+		<!-- td class="row1" width="25" align="center">{topicrow.TOPIC_ICON_IMG}</td -->
+		<!-- ENDIF -->
+		<td class="row1">
+			<!-- IF topicrow.S_SELECT_TOPIC -->
+				<span class="genmed">[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ]&nbsp;</span>
+			<!-- ENDIF -->
+			<!-- IF topicrow.S_TOPIC_UNAPPROVED -->
+				<a href="{topicrow.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a>&nbsp;
+			<!-- ENDIF -->
+			<!-- IF topicrow.S_TOPIC_REPORTED -->
+				<a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;
+			<!-- ENDIF -->
+			<p class="topictitle">{topicrow.NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p>
+		</td>
+		<td class="row1" width="50" align="center"><p class="topicdetails">{topicrow.REPLIES}</p></td>
+		<td class="row1" width="120" align="center"><p class="topicdetails">{topicrow.LAST_POST_TIME}</p></td>
+		<td class="row2" align="center"><input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}" {topicrow.S_TOPIC_CHECKED}/></td>
 
-			</tr>
-			<!-- BEGINELSE -->
-			<tr>
-				<td class="row1" colspan="8" height="28" align="center"><p class="gen">{L_NO_TOPICS}</p></td>
-			</tr>
-			<!-- END topicrow -->
-			<tr>
-				<td class="cat" colspan="6" align="right">
-					<select name="action">
-						<!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF -->
-						<!-- IF S_CAN_MOVE --><option value="move">{L_MOVE}</option><!-- ENDIF -->
-						<!-- IF S_CAN_FORK --><option value="fork">{L_FORK}</option><!-- ENDIF -->
-						<!-- IF S_CAN_LOCK --><option value="lock">{L_LOCK}</option><option value="unlock">{L_UNLOCK}</option><!-- ENDIF -->
-						<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
-					</select>
-					<input class="btnmain" type="submit" value="{L_SUBMIT}" />
-				</td>
-			</tr>
-		</table></form>
+	</tr>
+	<!-- BEGINELSE -->
+	<tr>
+		<td class="row1" colspan="8" height="28" align="center"><p class="gen">{L_NO_TOPICS}</p></td>
+	</tr>
+	<!-- END topicrow -->
+	<tr>
+		<td class="cat" colspan="6" align="right">
+			<select name="action">
+				<!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF -->
+				<!-- IF S_CAN_MOVE --><option value="move">{L_MOVE}</option><!-- ENDIF -->
+				<!-- IF S_CAN_FORK --><option value="fork">{L_FORK}</option><!-- ENDIF -->
+				<!-- IF S_CAN_LOCK --><option value="lock">{L_LOCK}</option><option value="unlock">{L_UNLOCK}</option><!-- ENDIF -->
+				<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
+			</select>
+			<input class="btnmain" type="submit" value="{L_SUBMIT}" />
+		</td>
+	</tr>
+</table></form>
+
+<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
+	<tr>
+		<td align="right" valign="top" nowrap="nowrap"><b class="gensmall"><a href="javascript:marklist('mcp', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('mcp', false);">{L_UNMARK_ALL}</a></b></td>
+	</tr>
+</table>
 
 <!-- INCLUDE mcp_footer.html -->
 \ No newline at end of file
diff --git a/phpBB/styles/subSilver/template/mcp_post.html b/phpBB/styles/subSilver/template/mcp_post.html
index ecd0bc7c80..ff59b7b5c0 100644
--- a/phpBB/styles/subSilver/template/mcp_post.html
+++ b/phpBB/styles/subSilver/template/mcp_post.html
@@ -1,5 +1,7 @@
 <!-- INCLUDE mcp_header.html -->
 
+<!-- $Id$ -->
+
 <table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg"><form method="post" name="mcp_approve" action="{U_APPROVE_ACTION}">
 <tr>
 	<th colspan="2" height="28" align="center">{L_POST_DETAILS}</th>
diff --git a/phpBB/styles/subSilver/template/mcp_topic.html b/phpBB/styles/subSilver/template/mcp_topic.html
index 181dbb3d6d..29cbde3ef2 100644
--- a/phpBB/styles/subSilver/template/mcp_topic.html
+++ b/phpBB/styles/subSilver/template/mcp_topic.html
@@ -1,5 +1,7 @@
 <!-- INCLUDE mcp_header.html -->
 
+<!-- $Id$ -->
+
 <form name="mcp" method="post" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1">
 	<!-- IF S_CAN_SPLIT -->
 	<tr>