makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

make sure we do not have empty select fields

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6286 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-08-12 19:36:36 +00:00
parent 5c0b8186a0
commit 5b164b086b
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/mcp/mcp_topic.php
View file

@ -190,7 +190,7 @@ function mcp_topic_view($id, $mode, $action)
'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED', false, true), 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED', false, true),
'S_MCP_ACTION' => "$url&i=$id&mode=$mode&action=$action&start=$start", 'S_MCP_ACTION' => "$url&i=$id&mode=$mode&action=$action&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_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_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, 'S_CAN_DELETE' => ($auth->acl_get('m_delete', $topic_info['forum_id'])) ? true : false,

1
phpBB/language/en/mcp.php
View file

@ -197,6 +197,7 @@ $lang = array_merge($lang, array(
'NOTIFY_USER_WARN' => 'Notify user about warning?', 'NOTIFY_USER_WARN' => 'Notify user about warning?',
'NOT_MODERATOR' => 'You are not a moderator of this forum', 'NOT_MODERATOR' => 'You are not a moderator of this forum',
'NO_DESTINATION_FORUM' => 'Please select a forum for destination', '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_ENTRIES' => 'No log entries for this period',
'NO_FEEDBACK' => 'No feedback exists for this user', 'NO_FEEDBACK' => 'No feedback exists for this user',
'NO_FINAL_TOPIC_SELECTED' => 'You have to select a destination topic for merging posts', 'NO_FINAL_TOPIC_SELECTED' => 'You have to select a destination topic for merging posts',

6
phpBB/styles/subSilver/template/mcp_move.html
View file

@ -13,6 +13,7 @@
<!-- IF ADDITIONAL_MSG --> <!-- IF ADDITIONAL_MSG -->
<span class="gen" style="color:red">{ADDITIONAL_MSG}</span><br /> <span class="gen" style="color:red">{ADDITIONAL_MSG}</span><br />
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_FORUM_SELECT -->
<span class="gen"><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span> <span class="gen"><br />{L_SELECT_DESTINATION_FORUM}&nbsp;&nbsp;</span>
<select name="to_forum_id">{S_FORUM_SELECT}</select><br /> <select name="to_forum_id">{S_FORUM_SELECT}</select><br />
<!-- IF S_CAN_LEAVE_SHADOW --> <!-- IF S_CAN_LEAVE_SHADOW -->
@ -20,6 +21,11 @@
<!-- ENDIF --> <!-- ENDIF -->
<br />{S_HIDDEN_FIELDS}<span class="gen">{MESSAGE_TEXT}</span><br /><br /> <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> <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 -->
</td> </td>
</tr> </tr>
</table> </table>

2
phpBB/styles/subSilver/template/mcp_topic.html
View file

@ -16,7 +16,7 @@
</tr> </tr>
<tr> <tr>
<td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td> <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> </tr>
<!-- IF S_SHOW_TOPIC_ICONS --> <!-- IF S_SHOW_TOPIC_ICONS -->