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

[ticket/12174] Corrections

Browse source 
PHPBB3-12174
This commit is contained in:
Tristan Darricau 2014-05-08 19:07:18 +02:00
parent 7935388306
commit 112e55e8ab
1 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
phpBB/phpbb/content_visibility.php
View file

@ -426,7 +426,7 @@ class content_visibility
foreach ($sql_ary as $field => $value_change) foreach ($sql_ary as $field => $value_change)
{ {
$topic_update_array[] = 'topic_' . $field . ' = topic_' . $field . $value_change; $topic_update_array['topic_' . $field] = 'topic_' . $field . $value_change;
$forum_sql[] = 'forum_' . $field . ' = forum_' . $field . $value_change; $forum_sql[] = 'forum_' . $field . ' = forum_' . $field . $value_change;
} }
@ -440,46 +440,35 @@ class content_visibility
$update_topic_attachments_flag = false; $update_topic_attachments_flag = false;
if ($post_id) if ($post_id)
{ {
if (is_array($post_id)) $sql = 'SELECT 1 as nb_attachments
{
$where_clause = $this->db->sql_in_set('post_id', array_map('intval', $post_id), true);
}
else
{
$where_clause = 'post_id <> ' . (int) $post_id;
}
$sql = 'SELECT count(*) as nb_attachments
FROM ' . POSTS_TABLE . ' FROM ' . POSTS_TABLE . '
WHERE topic_id = ' . (int) $topic_id . ' WHERE topic_id = ' . (int) $topic_id . '
AND post_attachment = 1 AND post_attachment = 1
AND post_visibility = ' . ITEM_APPROVED . ' AND post_visibility = ' . ITEM_APPROVED . '
AND ' . $where_clause; AND ' . $this->db->sql_in_set('post_id', $post_id, true);
$result = $this->db->sql_query($sql); $result = $this->db->sql_query_limit($sql, 1);
if ($row = $this->db->sql_fetchrow($result)) if ($row = $this->db->sql_fetchrow($result))
{ {
if ($row['nb_attachments'] == 0) if ($row['nb_attachments'] == 0)
{ {
$update_topic_attachments_flag = true; $update_topic_attachments_flag = true;
$topic_update_array[] = 'topic_attachment = 0'; $topic_update_array['topic_attachment'] = 0;
} }
else else if ($visibility == ITEM_APPROVED)
{ {
if ($visibility == ITEM_APPROVED) $update_topic_attachments_flag = true;
{ $topic_update_array['topic_attachment'] = 1;
$update_topic_attachments_flag = true;
$topic_update_array[] = 'topic_attachment = 1';
}
} }
} }
$this->db->sql_freeresult($result);
} }
if ($update_topic_postcount || $update_topic_attachments_flag) if ($update_topic_postcount || $update_topic_attachments_flag)
{ {
// Update the number for replies and posts, and update the attachments flag // Update the number for replies and posts, and update the attachments flag
$sql = 'UPDATE ' . $this->topics_table . ' $sql = 'UPDATE ' . $this->topics_table . '
SET ' . implode(', ', $topic_update_array) . ' SET ' . $this->db->sql_build_array('UPDATE', $topic_update_array) . '
WHERE topic_id = ' . (int) $topic_id; WHERE topic_id = ' . (int) $topic_id;
$this->db->sql_query($sql); $this->db->sql_query($sql);
} }