diff options
| author | rxu <rxu@mail.ru> | 2015-05-17 21:52:30 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2015-05-17 21:52:30 +0700 |
| commit | 73fd75abf13b3e7c7f8a8d2910085a149f71631e (patch) | |
| tree | fb11eb5f6199eefa546542ac71572da57c0db4c3 /phpBB/styles | |
| parent | e52bc2d02283aab8fc0a588feec74ec8858c48f8 (diff) | |
| download | forums-73fd75abf13b3e7c7f8a8d2910085a149f71631e.tar forums-73fd75abf13b3e7c7f8a8d2910085a149f71631e.tar.gz forums-73fd75abf13b3e7c7f8a8d2910085a149f71631e.tar.bz2 forums-73fd75abf13b3e7c7f8a8d2910085a149f71631e.tar.xz forums-73fd75abf13b3e7c7f8a8d2910085a149f71631e.zip | |
[ticket/13846] Fix softdelete feature workflow in viewtopic
Changes:
- For permanent deletion of softdeleted post, disapprove mode has been changed
to delete mode;
- If post delete and softdelete are allowed, delete button triggers softdelete
mode;
- If a user can't permanently delete posts but can restore softdeleted posts,
delete button won't be displayed for softdeleted posts.
Subsilver2 is unaffected.
PHPBB3-13846
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index e976c36f7b..13b63bb1a9 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -269,7 +269,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} |