From 1a07cd63a1e5a7edd7ee21365f2c7e340a8bac3d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 20 Dec 2012 19:24:26 +0100
Subject: [PATCH] [feature/soft-delete] Fix "Mark all" and "Unmark all" links
 on topic list

PHPBB3-9657
---
 phpBB/styles/prosilver/template/mcp_queue.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html
index 8ef10a0dae..e015531138 100644
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -107,13 +107,19 @@
 <!-- IF .postrow -->
 	<fieldset class="display-actions">
 		<!-- IF S_RESTORE -->
-		<input class="button2" type="submit" name="action[disapprove]" value="{L_DELETE}" />&nbsp;
+		<input class="button2" type="submit" name="action[delete]" value="{L_DELETE}" />&nbsp;
 		<input class="button1" type="submit" name="action[restore]" value="{L_RESTORE}" />
 		<!-- ELSE -->
 		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
 		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" />
 		<!-- ENDIF -->
-		<div><a href="#" onclick="marklist('mcp', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
+		<div>
+			<!-- IF S_TOPICS -->
+				<a href="#" onclick="marklist('mcp', 'topic_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'topic_id_list', false); return false;">{L_UNMARK_ALL}</a>
+			<!-- ELSE -->
+				<a href="#" onclick="marklist('mcp', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a>
+			<!-- ENDIF -->
+		</div>
 	</fieldset>
 <!-- ENDIF -->
 </form>