diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-13 08:57:20 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-13 08:57:20 -0700 |
| commit | 87795eba55172ed43119dd0ee022db68cf3ba8f6 (patch) | |
| tree | 046da75f4a7ff4de734584b021ab86c06ea1feff /phpBB/includes/feed/forums.php | |
| parent | d879acb7cca1a05a9adacc2376ab4118bd81ab4a (diff) | |
| parent | 167ca1f33f8265e5dea6481cc69de16ccfdd0dce (diff) | |
| download | forums-87795eba55172ed43119dd0ee022db68cf3ba8f6.tar forums-87795eba55172ed43119dd0ee022db68cf3ba8f6.tar.gz forums-87795eba55172ed43119dd0ee022db68cf3ba8f6.tar.bz2 forums-87795eba55172ed43119dd0ee022db68cf3ba8f6.tar.xz forums-87795eba55172ed43119dd0ee022db68cf3ba8f6.zip | |
Merge pull request #1017 from nickvergessen/feature/softdelete-1-permission
Soft delete
Diffstat (limited to 'phpBB/includes/feed/forums.php')
| -rw-r--r-- | phpBB/includes/feed/forums.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/feed/forums.php b/phpBB/includes/feed/forums.php index 72f786aa6a..409097a9f3 100644 --- a/phpBB/includes/feed/forums.php +++ b/phpBB/includes/feed/forums.php @@ -49,7 +49,7 @@ class phpbb_feed_forums extends phpbb_feed_base $this->sql = array( 'SELECT' => 'f.forum_id, f.left_id, f.forum_name, f.forum_last_post_time, f.forum_desc, f.forum_desc_bitfield, f.forum_desc_uid, f.forum_desc_options, - f.forum_topics, f.forum_posts', + f.forum_topics_approved, f.forum_posts_approved', 'FROM' => array(FORUMS_TABLE => 'f'), 'WHERE' => 'f.forum_type = ' . FORUM_POST . ' AND ' . $this->db->sql_in_set('f.forum_id', $in_fid_ary), @@ -65,8 +65,8 @@ class phpbb_feed_forums extends phpbb_feed_base if ($this->config['feed_item_statistics']) { - $item_row['statistics'] = $this->user->lang('TOTAL_TOPICS', (int) $row['forum_topics']) - . ' ' . $this->separator_stats . ' ' . $this->user->lang('TOTAL_POSTS_COUNT', (int) $row['forum_posts']); + $item_row['statistics'] = $this->user->lang('TOTAL_TOPICS', (int) $row['forum_topics_approved']) + . ' ' . $this->separator_stats . ' ' . $this->user->lang('TOTAL_POSTS_COUNT', (int) $row['forum_posts_approved']); } } } |