mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9956] Display error message if no disapprove reason given Conflicts: phpBB/includes/mcp/mcp_queue.php
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
<div class="content">
|
||||
|
||||
<h2>{MESSAGE_TITLE}</h2>
|
||||
<!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF -->
|
||||
<!-- IF ADDITIONAL_MSG --><p class="error">{ADDITIONAL_MSG}</p><!-- ENDIF -->
|
||||
|
||||
<fieldset>
|
||||
<!-- IF S_NOTIFY_POSTER -->
|
||||
|
@@ -74,6 +74,7 @@
|
||||
<p class="rules">
|
||||
<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />
|
||||
<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
|
||||
<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
|
||||
<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
|
||||
{S_FORM_TOKEN}
|
||||
</p>
|
||||
|
Reference in New Issue
Block a user