makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/soft-delete] Make use of set_post_visibility() limits when applicable

Browse source 
PHPBB3-9567
This commit is contained in:
Joas Schilling 2012-10-05 13:15:55 +02:00
parent bfa6a50a4f
commit 42bb97a95c
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
phpBB/includes/content_visibility.php
View file

@ -143,6 +143,24 @@ class phpbb_content_visibility
{ {
global $db; global $db;
if (in_array($visibility, array(ITEM_APPROVED, ITEM_DELETED)))
{
return;
}
$sql = 'SELECT topic_visibility, topic_delete_time
FROM ' . TOPICS_TABLE . '
WHERE topic_id = ' . (int) $topic_id;
$result = $db->sql_query($sql);
$original_topic_data = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if (!$original_topic_data)
{
// The topic does not exist...
return;
}
$data = array( $data = array(
'topic_visibility' => (int) $visibility, 'topic_visibility' => (int) $visibility,
'topic_delete_user' => (int) $user_id, 'topic_delete_user' => (int) $user_id,
@ -155,10 +173,16 @@ class phpbb_content_visibility
WHERE topic_id = ' . (int) $topic_id; WHERE topic_id = ' . (int) $topic_id;
$db->sql_query($sql); $db->sql_query($sql);
// If we're approving, disapproving, or deleteing a topic // If we're restoring a topic we only restore posts, that were soft deleted through the topic soft deletion.
// we also update all posts in that topic that need to be changed. if ($original_topic_data['topic_delete_time'] && $original_topic_data['topic_visibility'] == ITEM_DELETED && $visibility == ITEM_APPROVED)
// However, we do not set the same reason for every post. {
self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true); // Note, we do not set the same reason for every post.
self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true, $original_topic_data['topic_visibility'], $original_topic_data['topic_delete_time']);
}
else
{
self::set_post_visibility($visibility, false, $topic_id, $forum_id, $user_id, $time, '', true, true);
}
} }
/** /**