aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_main.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-11-10 11:24:52 +0100
committerJoas Schilling <nickvergessen@gmx.de>2012-11-10 11:24:52 +0100
commitf77a6eaab5485329a3b13922649fb8902e6e397f (patch)
tree903d9aa277fc8c015886af1f9be0a96930b0de4c /phpBB/includes/mcp/mcp_main.php
parent9c2a58eff4c2bd164ee3bdb2ec66729d4562963d (diff)
downloadforums-f77a6eaab5485329a3b13922649fb8902e6e397f.tar
forums-f77a6eaab5485329a3b13922649fb8902e6e397f.tar.gz
forums-f77a6eaab5485329a3b13922649fb8902e6e397f.tar.bz2
forums-f77a6eaab5485329a3b13922649fb8902e6e397f.tar.xz
forums-f77a6eaab5485329a3b13922649fb8902e6e397f.zip
[feature/soft-delete] Fix the rest of *_approved and the delete_post unit test
PHPBB3-9567
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
-rw-r--r--phpBB/includes/mcp/mcp_main.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index aeaa37f4cb..d8ef3e261b 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -570,8 +570,8 @@ function mcp_move_topic($topic_ids)
$sync_sql = array();
if ($posts_moved)
{
- $sync_sql[$to_forum_id][] = 'forum_posts = forum_posts + ' . (int) $posts_moved;
- $sync_sql[$forum_id][] = 'forum_posts = forum_posts - ' . (int) $posts_moved;
+ $sync_sql[$to_forum_id][] = 'forum_posts_approved = forum_posts_approved + ' . (int) $posts_moved;
+ $sync_sql[$forum_id][] = 'forum_posts_approved = forum_posts_approved - ' . (int) $posts_moved;
}
if ($posts_moved_unapproved)
{
@@ -586,10 +586,10 @@ function mcp_move_topic($topic_ids)
if ($topics_moved)
{
- $sync_sql[$to_forum_id][] = 'forum_topics = forum_topics + ' . (int) $topics_moved;
+ $sync_sql[$to_forum_id][] = 'forum_topics_approved = forum_topics_approved + ' . (int) $topics_moved;
if ($topics_moved - $shadow_topics > 0)
{
- $sync_sql[$forum_id][] = 'forum_topics = forum_topics - ' . (int) ($topics_moved - $shadow_topics);
+ $sync_sql[$forum_id][] = 'forum_topics_approved = forum_topics_approved - ' . (int) ($topics_moved - $shadow_topics);
}
}
if ($topics_moved_unapproved)
@@ -1348,8 +1348,8 @@ function mcp_fork_topic($topic_ids)
// Sync new topics, parent forums and board stats
$sql = 'UPDATE ' . FORUMS_TABLE . '
- SET forum_posts = forum_posts + ' . $total_posts . ',
- forum_topics = forum_topics + ' . sizeof($new_topic_id_list) . '
+ SET forum_posts_approved = forum_posts_approved + ' . $total_posts . ',
+ forum_topics_approved = forum_topics_approved + ' . sizeof($new_topic_id_list) . '
WHERE forum_id = ' . $to_forum_id;
$db->sql_query($sql);