From 1c61e549b2866cda14164146c4823327cea29b4c Mon Sep 17 00:00:00 2001
From: BlockMen <nmuelll@web.de>
Date: Tue, 22 Apr 2014 21:05:57 +0200
Subject: [PATCH] Fix other languages subforums

---
 template/forumlist_body.html |  1 -
 template/index_body.html     |  2 +-
 template/viewforum_body.html | 22 +++++++++++-----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/template/forumlist_body.html b/template/forumlist_body.html
index 856f268..c4427eb 100644
--- a/template/forumlist_body.html
+++ b/template/forumlist_body.html
@@ -1,4 +1,3 @@
-<!-- IF U_MCP --><p style='clear:both; margin-top:-3em;'>[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ENDIF -->
 <!-- BEGIN forumrow -->
 	<!-- IF (forumrow.S_IS_CAT and not forumrow.S_FIRST_ROW) or forumrow.S_NO_CAT  -->
 			</ul>
diff --git a/template/index_body.html b/template/index_body.html
index 6bfb6e6..2f74e38 100644
--- a/template/index_body.html
+++ b/template/index_body.html
@@ -11,7 +11,7 @@
 </ul>
 </div>
 <!-- ENDIF -->
-
+<!-- IF U_MCP --><p style='clear:both; margin-top:-3em;'>[&nbsp;<a href="{U_MCP}">{L_MCP}</a>&nbsp;]</p><!-- ENDIF -->
 <!-- INCLUDE forumlist_body.html -->
 
 <!-- IF not S_USER_LOGGED_IN and not S_IS_BOT -->
diff --git a/template/viewforum_body.html b/template/viewforum_body.html
index ac46f3c..d0448c7 100644
--- a/template/viewforum_body.html
+++ b/template/viewforum_body.html
@@ -25,15 +25,6 @@
 	</div>
 <!-- ENDIF -->
 
-<!-- IF S_HAS_SUBFORUM -->
-<!-- IF not S_IS_BOT and U_MARK_FORUMS -->
-<ul class="linklist">
-	<li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_SUBFORUMS_READ}</a></li>
-</ul>
-<!-- ENDIF -->
-	<!-- INCLUDE forumlist_body.html -->
-<!-- ENDIF -->
-
 <!-- IF S_DISPLAY_POST_INFO or PAGINATION or TOTAL_POSTS or TOTAL_TOPICS -->
 	<div class="topic-actions" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->>
 
@@ -168,7 +159,7 @@
 	<!-- ENDIF -->
 <!-- END topicrow -->
 
-<!-- IF S_SELECT_SORT_DAYS and not S_DISPLAY_ACTIVE -->
+<!-- IF S_SELECT_SORT_DAYS and not S_DISPLAY_ACTIVE and not S_HAS_SUBFORUM -->
 	<form method="post" action="{S_FORUM_ACTION}">
 		<fieldset class="display-options">
 			<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
@@ -183,7 +174,7 @@
 	<hr />
 <!-- ENDIF -->
 
-<!-- IF .topicrow and not S_DISPLAY_ACTIVE -->
+<!-- IF .topicrow and not S_DISPLAY_ACTIVE and not S_HAS_SUBFORUM -->
 	<div class="topic-actions">
 		<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
 		<div class="buttons">
@@ -203,6 +194,15 @@
 	</div>
 <!-- ENDIF -->
 
+<!-- IF S_HAS_SUBFORUM -->
+<!-- IF not S_IS_BOT and U_MARK_FORUMS -->
+<ul class="linklist">
+	<li class="rightside"><a href="{U_MARK_FORUMS}">{L_MARK_SUBFORUMS_READ}</a></li>
+</ul>
+<!-- ENDIF -->
+	<!-- INCLUDE forumlist_body.html -->
+<!-- ENDIF -->
+
 <!-- INCLUDE jumpbox.html -->
 
 <!-- IF S_DISPLAY_ONLINE_LIST -->