From 23a9077a0b4b3ce6ee8c759675fb55d6646ff364 Mon Sep 17 00:00:00 2001
From: Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net>
Date: Wed, 23 Apr 2003 22:58:10 +0000
Subject: [PATCH] Changed: topic_view displays the "merge" button, no matter if
 a destination topic has been selected

git-svn-id: file:///svn/phpbb/trunk@3940 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/templates/subSilver/mcp_topic.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/templates/subSilver/mcp_topic.html b/phpBB/templates/subSilver/mcp_topic.html
index 7f10bf441d..e51e43129d 100644
--- a/phpBB/templates/subSilver/mcp_topic.html
+++ b/phpBB/templates/subSilver/mcp_topic.html
@@ -58,7 +58,7 @@
 	<!-- IF postrow.S_DISPLAY_MODES -->
 	<tr>
 		<td class="cat" colspan="3" height="28" align="center">
-			<!-- IF S_CAN_MERGE and TO_TOPIC_ID -->&nbsp;<input class="liteoption" type="submit" name="merge_posts" value="{L_MERGE_POSTS}" />&nbsp;<!-- ENDIF -->
+			<!-- IF S_CAN_MERGE -->&nbsp;<input class="liteoption" type="submit" name="merge_posts" value="{L_MERGE_POSTS}" />&nbsp;<!-- ENDIF -->
 			<!-- IF S_CAN_DELETE -->&nbsp;<input class="liteoption" type="submit" name="delete_posts" value="{L_DELETE_POSTS}" />&nbsp;<!-- ENDIF -->
 			<!-- IF S_CAN_APPROVE -->&nbsp;<input class="liteoption" type="submit" name="approve" value="{L_APPROVE_POSTS}" />&nbsp;<!-- ENDIF -->
 			<!-- IF S_CAN_SPLIT -->&nbsp;<input class="liteoption" type="submit" name="split_all" value="{L_SPLIT_POSTS}" />&nbsp;&nbsp;<input class="liteoption" type="submit" name="split_beyond" value="{L_SPLIT_AFTER}" />&nbsp;<!-- ENDIF -->