diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-07 16:50:43 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-07 16:50:43 +0200 |
| commit | f3ea34b3110a2fea1a87c34c8683c1939dff7fef (patch) | |
| tree | df7b6d2f4fb7d863eec966f39d598784772ec87c /phpBB/styles/prosilver | |
| parent | 3c448f889fba3dd2552d9b76ce2c8dca48f6bd3e (diff) | |
| parent | e5b2dc922f1c2e94332ffcc5e9ea002ce5326837 (diff) | |
| download | forums-f3ea34b3110a2fea1a87c34c8683c1939dff7fef.tar forums-f3ea34b3110a2fea1a87c34c8683c1939dff7fef.tar.gz forums-f3ea34b3110a2fea1a87c34c8683c1939dff7fef.tar.bz2 forums-f3ea34b3110a2fea1a87c34c8683c1939dff7fef.tar.xz forums-f3ea34b3110a2fea1a87c34c8683c1939dff7fef.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_post.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index fc9664f6c9..a0b470cbca 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -91,9 +91,9 @@ <form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}"> <p class="post-notice deleted"> - <input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> + <!-- IF S_CAN_DELETE_POST --><input class="button2" type="submit" value="{L_DELETE}" name="action[delete]" /> <!-- ENDIF --> <input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" /> - <!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF --> + <!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="deleted_posts" /><!-- ENDIF --> <input type="hidden" name="post_id_list[]" value="{POST_ID}" /> {S_FORM_TOKEN} </p> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 62dfcb1ebb..cebf2c1ff6 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -305,7 +305,9 @@ <form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}"> <p class="post-notice deleted"> <strong>{L_POST_DELETED_ACTION}</strong> - <input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> + <!-- IF postrow.S_DELETE_PERMANENT --> + <input class="button2" type="submit" value="{L_DELETE}" name="action[delete]" /> + <!-- ENDIF --> <input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" /> <input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" /> {S_FORM_TOKEN} |