mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[feature/soft-delete] Add test case for (soft)deleting the only post + fix

Browse Source 
PHPBB3-9567
This commit is contained in:
Joas Schilling
2012-10-06 19:56:52 +02:00
parent 44005f338e
commit 25804eb8e8
4 changed files with 93 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/functions_posting.php
View File

@@ -1461,11 +1461,11 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
}
// (Soft) delete the post
if ($is_soft)
if ($is_soft && ($post_mode != 'delete_topic'))
{
phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
}
else
else if (!$is_soft)
{
if (!delete_posts('post_id', array($post_id), false, false))
{
@@ -1502,7 +1502,6 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
{
$topic_row = array();
phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason);
phpbb_content_visibility::remove_topic_from_statistic($topic_id, $forum_id, $topic_row, $sql_data);
}
else
{