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

fix for a bug spotted by ToonArmy within bug #3000 (thanks to him for providing a sample patch too)

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6148 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-07-06 15:00:31 +00:00
parent 0050879825
commit 2b531a279f
1 changed files with 51 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
phpBB/includes/mcp/mcp_main.php
View File

@@ -320,26 +320,68 @@ function change_topic_type($action, $topic_ids)
{ {
$sql = 'UPDATE ' . TOPICS_TABLE . " $sql = 'UPDATE ' . TOPICS_TABLE . "
SET topic_type = $new_topic_type, forum_id = $forum_id SET topic_type = $new_topic_type, forum_id = $forum_id
WHERE topic_id IN (" . implode(', ', $topic_ids) . ') WHERE topic_id IN (" . implode(', ', $topic_ids) . ')
AND forum_id = 0'; AND forum_id = 0';
$db->sql_query($sql); $db->sql_query($sql);
// Update forum_ids for all posts
$sql = 'UPDATE ' . POSTS_TABLE . "
SET forum_id = $forum_id
WHERE topic_id IN (" . implode(', ', $topic_ids) . ')
AND forum_id = 0';
$db->sql_query($sql);
sync('forum', 'forum_id', $forum_id);
} }
} }
else else
{ {
$sql = 'UPDATE ' . TOPICS_TABLE . " // Get away with those topics already being a global announcement by re-calculating $topic_ids
SET topic_type = $new_topic_type, forum_id = 0 $sql = 'SELECT topic_id
WHERE topic_id IN (" . implode(', ', $topic_ids) . ")"; FROM ' . TOPICS_TABLE . '
$db->sql_query($sql); WHERE topic_id IN (' . implode(', ', $topic_ids) . ')
AND forum_id <> 0';
$result = $db->sql_query($sql);
$topic_ids = array();
while ($row = $db->sql_fetchrow($result))
{
$topic_ids[] = $row['topic_id'];
}
$db->sql_freeresult($result);
if (sizeof($topic_ids))
{
// Delete topic shadows for global announcements
$sql = 'DELETE FROM ' . TOPICS_TABLE . '
WHERE topic_moved_id IN (' . implode(', ', $topic_ids) . ')';
$db->sql_query($sql);
$sql = 'UPDATE ' . TOPICS_TABLE . "
SET topic_type = $new_topic_type, forum_id = 0
WHERE topic_id IN (" . implode(', ', $topic_ids) . ')';
$db->sql_query($sql);
// Update forum_ids for all posts
$sql = 'UPDATE ' . POSTS_TABLE . '
SET forum_id = 0
WHERE topic_id IN (' . implode(', ', $topic_ids) . ')';
$db->sql_query($sql);
sync('forum', 'forum_id', $forum_id);
}
} }
$success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_TYPE_CHANGED' : 'TOPICS_TYPE_CHANGED'; $success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_TYPE_CHANGED' : 'TOPICS_TYPE_CHANGED';
$data = get_topic_data($topic_ids); if (sizeof($topic_ids))
foreach ($data as $topic_id => $row)
{ {
add_log('mod', $forum_id, $topic_id, 'LOG_TOPIC_TYPE_CHANGED', $row['topic_title']); $data = get_topic_data($topic_ids);
foreach ($data as $topic_id => $row)
{
add_log('mod', $forum_id, $topic_id, 'LOG_TOPIC_TYPE_CHANGED', $row['topic_title']);
}
} }
} }
else else
@@ -542,10 +584,6 @@ function mcp_delete_topic($topic_ids)
} }
$return = delete_topics('topic_id', $topic_ids, true); $return = delete_topics('topic_id', $topic_ids, true);
/**
* @todo Adjust total post count (mcp_delete_topic)
*/
} }
else else
{ {