diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-04-01 22:15:59 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-04-01 22:15:59 +0000 |
| commit | e6dab93a02a05a61799c1c0e56864961e8b56bba (patch) | |
| tree | 74f3c51982a8455ee1741af4127b69562f6bcde6 /phpBB/styles | |
| parent | f610ed82cbf0df2b5f8afd6ca3f88b9313281036 (diff) | |
| download | forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.tar forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.tar.gz forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.tar.bz2 forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.tar.xz forums-e6dab93a02a05a61799c1c0e56864961e8b56bba.zip | |
- urlencoded usernames don't need htmlspecialchars [Bug #8794]
- fulltext_mysql still used synonyms/ignore words [Bug #5405]
- merge tool extend to allow merging complete topics via quickmod and mcp_forum [Bug #5293]
- renamed "fork" to "copy" (was already called "copy" in some places)
- Copied posts should not increase post count, and should also not decrease it on deletion [Bug #8072]
git-svn-id: file:///svn/phpbb/trunk@7261 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/subSilver/template/mcp_forum.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/styles/subSilver/template/mcp_forum.html b/phpBB/styles/subSilver/template/mcp_forum.html index 34c2dd8e6b..f85dc48126 100644 --- a/phpBB/styles/subSilver/template/mcp_forum.html +++ b/phpBB/styles/subSilver/template/mcp_forum.html @@ -27,7 +27,7 @@ <!-- ENDIF --> <td class="row1"> <!-- IF topicrow.S_SELECT_TOPIC --> - <span class="genmed">[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT}</a> ] </span> + <span class="genmed">[ <a href="{topicrow.U_SELECT_TOPIC}">{L_SELECT_MERGE}</a> ] </span> <!-- ENDIF --> <p class="topictitle">{topicrow.NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a> <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --> @@ -57,6 +57,7 @@ <select name="action"> <option value="" selected="selected">{L_SELECT_ACTION}</option> <!-- IF S_CAN_DELETE --><option value="delete_topic">{L_DELETE}</option><!-- ENDIF --> + <!-- IF S_CAN_MERGE --><option value="merge_topics">{L_MERGE}</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 --> |