mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 20:56:40 +02:00
Code Issues Releases Wiki Activity

[feature/soft-delete] Remove the current work around on ajax confirm problem

Browse Source 
PHPBB3-9567
This commit is contained in:
Joas Schilling
2012-11-09 12:09:46 +01:00
parent 1c584ef8ba
commit fc110a7332
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
phpBB/posting.php
View File

@ -1599,7 +1599,7 @@ function handle_post_delete($forum_id, $topic_id, $post_id, &$post_data, $is_sof
} }
else else
{ {
global $template, $request; global $user, $template, $request;
$template->assign_vars(array( $template->assign_vars(array(
'S_SOFTDELETED' => $post_data['post_visibility'] == ITEM_DELETED, 'S_SOFTDELETED' => $post_data['post_visibility'] == ITEM_DELETED,
@ -1621,25 +1621,9 @@ function handle_post_delete($forum_id, $topic_id, $post_id, &$post_data, $is_sof
} }
// @todo: This needs fixing! AJAX confirm_box should be able to call template files! // @todo: This needs fixing! AJAX confirm_box should be able to call template files!
if ($request->is_ajax())
{
$l_confirm = (!isset($user->lang[$l_confirm . '_CONFIRM'])) ? $l_confirm : $user->lang[$l_confirm . '_CONFIRM'];
if ($auth->acl_gets('m_delete', 'f_delete', $forum_id) && $auth->acl_gets('m_softdelete', 'f_softdelete', $forum_id))
{
$l_confirm .= '<br />' . $user->lang['DELETE_PERMANENTLY'] . ': <input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" />';
}
if ($auth->acl_get('m_softdelete', $forum_id))
{
$l_confirm .= '<br />' . $user->lang['DELETE_REASON'] . ': <input type="text" name="delete_reason" id="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" />';
}
confirm_box(false, $l_confirm, build_hidden_fields($s_hidden_fields));
}
else
{
confirm_box(false, $l_confirm, build_hidden_fields($s_hidden_fields), 'confirm_delete_body.html'); confirm_box(false, $l_confirm, build_hidden_fields($s_hidden_fields), 'confirm_delete_body.html');
} }
} }
}
// If we are here the user is not able to delete - present the correct error message // If we are here the user is not able to delete - present the correct error message
if ($post_data['poster_id'] != $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id)) if ($post_data['poster_id'] != $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id))