mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-13 06:48:52 +00:00
git-svn-id: file:///svn/phpbb/trunk@6481 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
31463d2ccc
commit
152a653fd4
1 changed files with 10 additions and 1 deletions
|
@ -483,8 +483,17 @@ function mcp_move_topic($topic_ids)
|
||||||
$forum_ids[] = $row['forum_id'];
|
$forum_ids[] = $row['forum_id'];
|
||||||
add_log('mod', $to_forum_id, $topic_id, 'LOG_MOVE', $row['forum_name']);
|
add_log('mod', $to_forum_id, $topic_id, 'LOG_MOVE', $row['forum_name']);
|
||||||
|
|
||||||
|
// If we have moved a global announcement, we need to correct the topic type
|
||||||
|
if ($row['topic_type'] == POST_GLOBAL)
|
||||||
|
{
|
||||||
|
$sql = 'UPDATE ' . TOPICS_TABLE . '
|
||||||
|
SET topic_type = ' . POST_ANNOUNCE . '
|
||||||
|
WHERE topic_id = ' . (int) $row['topic_id'];
|
||||||
|
$db->sql_query($sql);
|
||||||
|
}
|
||||||
|
|
||||||
// Leave a redirection if required and only if the topic is visible to users
|
// Leave a redirection if required and only if the topic is visible to users
|
||||||
if ($leave_shadow && $row['topic_approved'])
|
if ($leave_shadow && $row['topic_approved'] && $row['topic_type'] != POST_GLOBAL)
|
||||||
{
|
{
|
||||||
$shadow = array(
|
$shadow = array(
|
||||||
'forum_id' => (int) $row['forum_id'],
|
'forum_id' => (int) $row['forum_id'],
|
||||||
|
|
Loading…
Add table
Reference in a new issue