aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-04-23 22:58:10 +0000
committerLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-04-23 22:58:10 +0000
commit23a9077a0b4b3ce6ee8c759675fb55d6646ff364 (patch)
tree6d5afa5758bb4684d48584f26823c2a5becd284a /phpBB
parent8796a09d01da2b56eed35ab0df6e78be3325255d (diff)
downloadforums-23a9077a0b4b3ce6ee8c759675fb55d6646ff364.tar
forums-23a9077a0b4b3ce6ee8c759675fb55d6646ff364.tar.gz
forums-23a9077a0b4b3ce6ee8c759675fb55d6646ff364.tar.bz2
forums-23a9077a0b4b3ce6ee8c759675fb55d6646ff364.tar.xz
forums-23a9077a0b4b3ce6ee8c759675fb55d6646ff364.zip
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
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/templates/subSilver/mcp_topic.html2
1 files changed, 1 insertions, 1 deletions
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 -->