aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-07-22 12:20:17 -0700
committerNathan Guse <nathaniel.guse@gmail.com>2013-07-22 12:20:17 -0700
commit127ee62eddf07d705c9b243169db338ee4cbfaef (patch)
tree2930da727f871dc9f65e3716975661ff8935a759 /phpBB/phpbb
parentb71038486e067daf0c608d73aabeb60a56e86840 (diff)
parenteffafa4b4d82e8f0debcda2e84e03117433e5a7d (diff)
downloadforums-127ee62eddf07d705c9b243169db338ee4cbfaef.tar
forums-127ee62eddf07d705c9b243169db338ee4cbfaef.tar.gz
forums-127ee62eddf07d705c9b243169db338ee4cbfaef.tar.bz2
forums-127ee62eddf07d705c9b243169db338ee4cbfaef.tar.xz
forums-127ee62eddf07d705c9b243169db338ee4cbfaef.zip
Merge pull request #1589 from marc1706/ticket/11717
[ticket/11717] Use topic_posts_approved instead of topic_replies
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/feed/topic.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php
index 36f958ac60..696b0f5a52 100644
--- a/phpBB/phpbb/feed/topic.php
+++ b/phpBB/phpbb/feed/topic.php
@@ -43,7 +43,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base
function open()
{
- $sql = 'SELECT f.forum_options, f.forum_password, t.topic_id, t.forum_id, t.topic_visibility, t.topic_title, t.topic_time, t.topic_views, t.topic_replies, t.topic_type
+ $sql = 'SELECT f.forum_options, f.forum_password, t.topic_id, t.forum_id, t.topic_visibility, t.topic_title, t.topic_time, t.topic_views, t.topic_posts_approved, t.topic_type
FROM ' . TOPICS_TABLE . ' t
LEFT JOIN ' . FORUMS_TABLE . ' f
ON (f.forum_id = t.forum_id)