mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity

[ticket/11942] Apply the modifications to subsilver

Browse Source 
PHPBB3-11942
This commit is contained in:
Tristan Darricau 2014-05-11 19:35:42 +02:00
parent 237619792d
commit 12e0e358d1
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/posting.php
View File

@ -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_ALLOWED' => ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? true : false,
'S_LOCK_POST_CHECKED' => ($lock_post_checked) ? ' checked="checked"' : '', 'S_LOCK_POST_CHECKED' => ($lock_post_checked) ? ' checked="checked"' : '',
'S_SOFTDELETE_CHECKED' => ($mode == 'edit' && $post_data['post_visibility'] == ITEM_DELETED) ? ' 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_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_RESTORE_ALLOWED' => $auth->acl_get('m_approve', $forum_id),
'S_IS_DELETED' => ($mode == 'edit' && $post_data['post_visibility'] == ITEM_DELETED) ? true : false, 'S_IS_DELETED' => ($mode == 'edit' && $post_data['post_visibility'] == ITEM_DELETED) ? true : false,

4
phpBB/styles/prosilver/template/confirm_delete_body.html
View File

@ -2,7 +2,7 @@
<form action="{S_CONFIRM_ACTION}" method="post"> <form action="{S_CONFIRM_ACTION}" method="post">
<p>{MESSAGE_TEXT}</p> <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 --> <!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
<label> <label>
<strong>{L_DELETE_PERMANENTLY}{L_COLON}</strong> <strong>{L_DELETE_PERMANENTLY}{L_COLON}</strong>
@ -35,7 +35,7 @@
<p>{MESSAGE_TEXT}</p> <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"> <fieldset class="fields1">
<!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE --> <!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
<dl> <dl>

4
phpBB/styles/subsilver2/template/confirm_delete_body.html
View File

@ -14,7 +14,7 @@
<p class="gen">{MESSAGE_TEXT}</p> <p class="gen">{MESSAGE_TEXT}</p>
<br /> <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"> <table border="0" width="90%" cellspacing="2" cellpadding="1">
<!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE --> <!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
<tr> <tr>
@ -25,12 +25,10 @@
</td> </td>
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_DELETE_REASON -->
<tr> <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" 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> <td class="row1"><input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></td>
</tr> </tr>
<!-- ENDIF -->
</table> </table>
<br /> <br />
<!-- ENDIF --> <!-- ENDIF -->