aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-03-07 14:02:11 +0100
committerJoas Schilling <nickvergessen@gmx.de>2013-03-07 14:02:11 +0100
commitbff6cf40ba03320247c777d651d47673b3d36d2b (patch)
treea46c539dce3e0a5bcb1a46f74ad50de304536fce /phpBB/includes/db
parent60c0da8b54e5347e472d2ce97e756623717fd011 (diff)
downloadforums-bff6cf40ba03320247c777d651d47673b3d36d2b.tar
forums-bff6cf40ba03320247c777d651d47673b3d36d2b.tar.gz
forums-bff6cf40ba03320247c777d651d47673b3d36d2b.tar.bz2
forums-bff6cf40ba03320247c777d651d47673b3d36d2b.tar.xz
forums-bff6cf40ba03320247c777d651d47673b3d36d2b.zip
[ticket/9657] Fix colum name in migration file
PHPBB3-9657
Diffstat (limited to 'phpBB/includes/db')
-rw-r--r--phpBB/includes/db/migration/data/310/softdelete_p1.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/db/migration/data/310/softdelete_p1.php b/phpBB/includes/db/migration/data/310/softdelete_p1.php
index 35f6138ef6..84f8eebd4a 100644
--- a/phpBB/includes/db/migration/data/310/softdelete_p1.php
+++ b/phpBB/includes/db/migration/data/310/softdelete_p1.php
@@ -134,7 +134,7 @@ class phpbb_db_migration_data_310_softdelete_p1 extends phpbb_db_migration
WHERE topic_visibility = ' . ITEM_UNAPPROVED;
$this->sql_query($sql);
- $sql = 'SELECT forum_id, topic_visibility, COUNT(topic_id) AS sum_topics, SUM(topic_posts) AS sum_posts, SUM(topic_posts_unapproved) AS sum_posts_unapproved
+ $sql = 'SELECT forum_id, topic_visibility, COUNT(topic_id) AS sum_topics, SUM(topic_posts_approved) AS sum_posts_approved, SUM(topic_posts_unapproved) AS sum_posts_unapproved
FROM ' . $this->table_prefix . 'topics
GROUP BY forum_id, topic_visibility';
$result = $this->db->sql_query($sql);
@@ -153,7 +153,7 @@ class phpbb_db_migration_data_310_softdelete_p1 extends phpbb_db_migration
);
}
- $update_forums[$forum_id]['forum_posts_approved'] += (int) $row['sum_posts'];
+ $update_forums[$forum_id]['forum_posts_approved'] += (int) $row['sum_posts_approved'];
$update_forums[$forum_id]['forum_posts_unapproved'] += (int) $row['sum_posts_unapproved'];
$update_forums[$forum_id][(($row['topic_visibility'] == ITEM_APPROVED) ? 'forum_topics_approved' : 'forum_topics_unapproved')] += (int) $row['sum_topics'];