mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2023-10-01 14:00:51 +02:00
parent 4cd895e456 42bf5778d5
commit 2ff409ae4d
5 changed files with 188 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/includes/functions_posting.php
View File

@@ -1353,7 +1353,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
{
$post_mode = 'delete_first_post';
}
else if ($data['topic_last_post_id'] == $post_id)
else if ($data['topic_last_post_id'] <= $post_id)
{
$post_mode = 'delete_last_post';
}
@@ -2879,7 +2879,14 @@ function phpbb_handle_post_delete($forum_id, $topic_id, $post_id, &$post_data, $
$delete_reason
));
$meta_info = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "p=$next_post_id") . "#p$next_post_id";
if ($next_post_id > 0)
{
$meta_info = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "p=$next_post_id") . "#p$next_post_id";
}
else
{
$meta_info = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id");
}
$message = $user->lang['POST_DELETED'];
if (!$request->is_ajax())

11
phpBB/phpbb/content_visibility.php
View File

@@ -521,11 +521,15 @@ class content_visibility
$postcounts[$num_posts][] = $poster_id;
}
$postcount_change = 0;
// Update users postcounts
foreach ($postcounts as $num_posts => $poster_ids)
{
if (in_array($visibility, array(ITEM_REAPPROVE, ITEM_DELETED)))
{
$postcount_change -= $num_posts;
$sql = 'UPDATE ' . $this->users_table . '
SET user_posts = 0
WHERE ' . $this->db->sql_in_set('user_id', $poster_ids) . '
@@ -540,6 +544,8 @@ class content_visibility
}
else
{
$postcount_change += $num_posts;
$sql = 'UPDATE ' . $this->users_table . '
SET user_posts = user_posts + ' . $num_posts . '
WHERE ' . $this->db->sql_in_set('user_id', $poster_ids);
@@ -547,6 +553,11 @@ class content_visibility
}
}
if ($postcount_change != 0)
{
$this->config->increment('num_posts', $postcount_change, false);
}
$update_topic_postcount = true;
// Sync the first/last topic information if needed