From 5b164b086b2aa6ba253aadf0a596d3ed20fbc7eb Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 12 Aug 2006 19:36:36 +0000
Subject: [PATCH] make sure we do not have empty select fields

git-svn-id: file:///svn/phpbb/trunk@6286 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/mcp/mcp_topic.php               |  2 +-
 phpBB/language/en/mcp.php                      |  1 +
 phpBB/styles/subSilver/template/mcp_move.html  | 18 ++++++++++++------
 phpBB/styles/subSilver/template/mcp_topic.html |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index a6cec131b2..691b92bd36 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -190,7 +190,7 @@ function mcp_topic_view($id, $mode, $action)
 		'UNAPPROVED_IMG'	=> $user->img('icon_topic_unapproved', 'POST_UNAPPROVED', false, true),
 
 		'S_MCP_ACTION'		=> "$url&amp;i=$id&amp;mode=$mode&amp;action=$action&amp;start=$start",
-		'S_FORUM_SELECT'	=> '<select name="to_forum_id">' . (($to_forum_id) ? make_forum_select($to_forum_id, false, false, true, true, true) : make_forum_select($topic_info['forum_id'], false, false, true, true, true)) . '</select>',
+		'S_FORUM_SELECT'	=> ($to_forum_id) ? make_forum_select($to_forum_id, false, false, true, true, true) : make_forum_select($topic_info['forum_id'], false, false, true, true, true),
 		'S_CAN_SPLIT'		=> ($auth->acl_get('m_split', $topic_info['forum_id'])) ? true : false,
 		'S_CAN_MERGE'		=> ($auth->acl_get('m_merge', $topic_info['forum_id'])) ? true : false,
 		'S_CAN_DELETE'		=> ($auth->acl_get('m_delete', $topic_info['forum_id'])) ? true : false,
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 635c2e2a9c..46c9b90418 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -197,6 +197,7 @@ $lang = array_merge($lang, array(
 	'NOTIFY_USER_WARN'		=> 'Notify user about warning?',
 	'NOT_MODERATOR'			=> 'You are not a moderator of this forum',
 	'NO_DESTINATION_FORUM'	=> 'Please select a forum for destination',
+	'NO_DESTINATION_FORUM_FOUND'	=> 'There is no destination forum available.',
 	'NO_ENTRIES'			=> 'No log entries for this period',
 	'NO_FEEDBACK'			=> 'No feedback exists for this user',
 	'NO_FINAL_TOPIC_SELECTED'	=> 'You have to select a destination topic for merging posts',
diff --git a/phpBB/styles/subSilver/template/mcp_move.html b/phpBB/styles/subSilver/template/mcp_move.html
index 21b01dfa64..04254307fa 100644
--- a/phpBB/styles/subSilver/template/mcp_move.html
+++ b/phpBB/styles/subSilver/template/mcp_move.html
@@ -13,13 +13,19 @@
 			<!-- IF ADDITIONAL_MSG -->
 				<span class="gen" style="color:red">{ADDITIONAL_MSG}</span><br />
 			<!-- ENDIF -->
-			<span class="gen"><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span>
-				<select name="to_forum_id">{S_FORUM_SELECT}</select><br />
-			<!-- IF S_CAN_LEAVE_SHADOW -->
-				<input type="checkbox" class="radio" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br />
+			<!-- IF S_FORUM_SELECT -->
+				<span class="gen"><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span>
+					<select name="to_forum_id">{S_FORUM_SELECT}</select><br />
+				<!-- IF S_CAN_LEAVE_SHADOW -->
+					<input type="checkbox" class="radio" name="move_leave_shadow" checked="checked" /><span class="gen">{L_LEAVE_SHADOW}</span><br />
+				<!-- ENDIF -->
+				<br />{S_HIDDEN_FIELDS}<span class="gen">{MESSAGE_TEXT}</span><br /><br />
+				<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></span>
+			<!-- ELSE -->
+				<span class="gen">{L_NO_DESTINATION_FORUM}</span><br /><br />
+					{S_HIDDEN_FIELDS}
+					<input type="submit" name="cancel" value="{L_CANCEL}" class="btnlite" />
 			<!-- ENDIF -->
-			<br />{S_HIDDEN_FIELDS}<span class="gen">{MESSAGE_TEXT}</span><br /><br />
-			<input type="submit" name="confirm" value="{YES_VALUE}" class="btnmain" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="btnlite" /></span>
 		</td>
 	</tr>
 	</table>
diff --git a/phpBB/styles/subSilver/template/mcp_topic.html b/phpBB/styles/subSilver/template/mcp_topic.html
index 611bc4fe84..119648289f 100644
--- a/phpBB/styles/subSilver/template/mcp_topic.html
+++ b/phpBB/styles/subSilver/template/mcp_topic.html
@@ -16,7 +16,7 @@
 	</tr>
 	<tr>
 		<td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td>
-		<td class="row2" colspan="2">{S_FORUM_SELECT}</td>
+		<td class="row2" colspan="2"><select name="to_forum_id">{S_FORUM_SELECT}</select></td>
 	</tr>
 
 	<!-- IF S_SHOW_TOPIC_ICONS -->