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

#10295

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7441 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-04-30 16:18:59 +00:00
parent 5538a812eb
commit ab9586a7f3
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/includes/functions_posting.php
View file

@ -1534,6 +1534,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
break; break;
} }
$post_approved = $sql_data[POSTS_TABLE]['sql']['post_approved'];
// And the topic ladies and gentlemen // And the topic ladies and gentlemen
switch ($post_mode) switch ($post_mode)
{ {
@ -1879,14 +1881,22 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
{ {
if ($topic_type != POST_GLOBAL) if ($topic_type != POST_GLOBAL)
{ {
$update_sql = update_post_information('forum', $data['forum_id'], true, $data['post_id']); if ($post_approved)
{
$update_sql = update_post_information('forum', $data['forum_id'], true, $data['post_id']);
}
if (sizeof($update_sql)) if (sizeof($update_sql))
{ {
$sql_data[FORUMS_TABLE]['stat'][] = implode(', ', $update_sql[$data['forum_id']]); $sql_data[FORUMS_TABLE]['stat'][] = implode(', ', $update_sql[$data['forum_id']]);
} }
} }
$update_sql = update_post_information('topic', $data['topic_id'], true, $data['post_id']); if ($post_approved)
{
$update_sql = update_post_information('topic', $data['topic_id'], true, $data['post_id']);
}
if (sizeof($update_sql)) if (sizeof($update_sql))
{ {
$sql_data[TOPICS_TABLE]['stat'][] = implode(', ', $update_sql[$data['topic_id']]); $sql_data[TOPICS_TABLE]['stat'][] = implode(', ', $update_sql[$data['topic_id']]);

12
phpBB/includes/mcp/mcp_main.php
View file

@ -546,11 +546,12 @@ function mcp_move_topic($topic_ids)
$db->sql_freeresult($result); $db->sql_freeresult($result);
$forum_sync_data[$forum_id]['forum_posts'] -= (int) $row_data['topic_posts']; $forum_sync_data[$forum_id]['forum_posts'] -= (int) $row_data['topic_posts'];
$forum_sync_data[$forum_id]['forum_topics'] -= (int) $topics_authed_moved;
$forum_sync_data[$forum_id]['forum_topics_real'] -= (int) $topics_moved;
$forum_sync_data[$to_forum_id]['forum_posts'] += (int) $row_data['topic_posts']; $forum_sync_data[$to_forum_id]['forum_posts'] += (int) $row_data['topic_posts'];
$forum_sync_data[$forum_id]['forum_topics'] -= (int) $topics_moved; $forum_sync_data[$to_forum_id]['forum_topics'] += (int) $topics_authed_moved;
$forum_sync_data[$to_forum_id]['forum_topics'] += (int) $topics_moved; $forum_sync_data[$to_forum_id]['forum_topics_real'] += (int) $topics_moved;
$forum_sync_data[$forum_id]['forum_topics_real'] -= (int) $topics_authed_moved;
$forum_sync_data[$to_forum_id]['forum_topics_real'] += (int) $topics_authed_moved;
$db->sql_transaction('begin'); $db->sql_transaction('begin');
@ -613,6 +614,7 @@ function mcp_move_topic($topic_ids)
$db->sql_query('INSERT INTO ' . TOPICS_TABLE . $db->sql_build_array('INSERT', $shadow)); $db->sql_query('INSERT INTO ' . TOPICS_TABLE . $db->sql_build_array('INSERT', $shadow));
$forum_sync_data[(int) $row['forum_id']]['forum_topics']++; $forum_sync_data[(int) $row['forum_id']]['forum_topics']++;
$forum_sync_data[(int) $row['forum_id']]['forum_topics_real']++;
} }
} }
unset($topic_data); unset($topic_data);
@ -620,7 +622,7 @@ function mcp_move_topic($topic_ids)
$success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_MOVED_SUCCESS' : 'TOPICS_MOVED_SUCCESS'; $success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_MOVED_SUCCESS' : 'TOPICS_MOVED_SUCCESS';
// we must update the info, this post is being moved and is not the newest anymore // we must update the info, this post is being moved and is not the newest anymore
if ($forum_sync_data[$forum_id]['forum_last_post_id'] == $row_data['last_post_id']) if ($forum_sync_data[$forum_id]['forum_last_post_id'] == $row_data['last_post_id'] && $row_data[''])
{ {
$forum_sync_data[$forum_id]['forum_last_post_id'] = 0; $forum_sync_data[$forum_id]['forum_last_post_id'] = 0;
$forum_sync_data[$forum_id]['forum_last_post_subject'] = ''; $forum_sync_data[$forum_id]['forum_last_post_subject'] = '';