diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-05-11 19:35:42 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-11 19:35:42 +0200 |
| commit | 12e0e358d1b04af41c34039dbc23b54f260883fd (patch) | |
| tree | f6b9c57ececac3bfbb75ea2d4f239049e128b5ec /phpBB | |
| parent | 237619792dd2d7b6c9e057307139e6bb52283df3 (diff) | |
| download | forums-12e0e358d1b04af41c34039dbc23b54f260883fd.tar forums-12e0e358d1b04af41c34039dbc23b54f260883fd.tar.gz forums-12e0e358d1b04af41c34039dbc23b54f260883fd.tar.bz2 forums-12e0e358d1b04af41c34039dbc23b54f260883fd.tar.xz forums-12e0e358d1b04af41c34039dbc23b54f260883fd.zip | |
[ticket/11942] Apply the modifications to subsilver
PHPBB3-11942
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/posting.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/confirm_delete_body.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/confirm_delete_body.html | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index cc39f70b48..2d25aedae8 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1537,7 +1537,6 @@ $template->assign_vars(array( 'S_LOCK_POST_ALLOWED' => ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? true : false, 'S_LOCK_POST_CHECKED' => ($lock_post_checked) ? ' checked="checked"' : '', 'S_SOFTDELETE_CHECKED' => ($mode == 'edit' && $post_data['post_visibility'] == ITEM_DELETED) ? ' checked="checked"' : '', - 'S_DELETE_REASON' => ($mode == 'edit' && $auth->acl_get('m_softdelete', $forum_id)) ? true : false, 'S_SOFTDELETE_ALLOWED' => ($mode == 'edit' && $phpbb_content_visibility->can_soft_delete($forum_id, $post_data['poster_id'], $lock_post_checked)) ? true : false, 'S_RESTORE_ALLOWED' => $auth->acl_get('m_approve', $forum_id), 'S_IS_DELETED' => ($mode == 'edit' && $post_data['post_visibility'] == ITEM_DELETED) ? true : false, diff --git a/phpBB/styles/prosilver/template/confirm_delete_body.html b/phpBB/styles/prosilver/template/confirm_delete_body.html index e755a76ae6..31dd9896cc 100644 --- a/phpBB/styles/prosilver/template/confirm_delete_body.html +++ b/phpBB/styles/prosilver/template/confirm_delete_body.html @@ -2,7 +2,7 @@ <form action="{S_CONFIRM_ACTION}" method="post"> <p>{MESSAGE_TEXT}</p> - <!-- IF not S_SOFTDELETED and (S_DELETE_REASON or (S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE)) --> + <!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE --> <!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE --> <label> <strong>{L_DELETE_PERMANENTLY}{L_COLON}</strong> @@ -35,7 +35,7 @@ <p>{MESSAGE_TEXT}</p> - <!-- IF not S_SOFTDELETED and (S_DELETE_REASON or (S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE)) --> + <!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE --> <fieldset class="fields1"> <!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE --> <dl> diff --git a/phpBB/styles/subsilver2/template/confirm_delete_body.html b/phpBB/styles/subsilver2/template/confirm_delete_body.html index 9e416f5195..a6874456cc 100644 --- a/phpBB/styles/subsilver2/template/confirm_delete_body.html +++ b/phpBB/styles/subsilver2/template/confirm_delete_body.html @@ -14,7 +14,7 @@ <p class="gen">{MESSAGE_TEXT}</p> <br /> - <!-- IF not S_SOFTDELETED and (S_DELETE_REASON or (S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE)) --> + <!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE --> <table border="0" width="90%" cellspacing="2" cellpadding="1"> <!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE --> <tr> @@ -25,12 +25,10 @@ </td> </tr> <!-- ENDIF --> - <!-- IF S_DELETE_REASON --> <tr> <td class="row1" valign="top"><span class="gen"><b>{L_DELETE_REASON}{L_COLON}</b></span><br /><span class="gensmall">{L_DELETE_REASON_EXPLAIN}</span></td> <td class="row1"><input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></td> </tr> - <!-- ENDIF --> </table> <br /> <!-- ENDIF --> |