diff options
| author | Andy Chase <asperous2@gmail.com> | 2013-07-22 16:27:07 -0700 |
|---|---|---|
| committer | Andy Chase <asperous2@gmail.com> | 2013-07-22 16:27:07 -0700 |
| commit | be16459b8939d89ff85aa92bc8a804e4489a35bf (patch) | |
| tree | 4b0e5dcc07d3a30c0ecebe98e037b3afc698daf0 /phpBB/phpbb | |
| parent | 9d38ded22875e023d4391e7724673087f87fa481 (diff) | |
| parent | c2d919f12d82b4c9c19f170f0c69c9b64d06f855 (diff) | |
| download | forums-be16459b8939d89ff85aa92bc8a804e4489a35bf.tar forums-be16459b8939d89ff85aa92bc8a804e4489a35bf.tar.gz forums-be16459b8939d89ff85aa92bc8a804e4489a35bf.tar.bz2 forums-be16459b8939d89ff85aa92bc8a804e4489a35bf.tar.xz forums-be16459b8939d89ff85aa92bc8a804e4489a35bf.zip | |
Merge branch 'develop' into ticket/11620
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/feed/topic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php index 36f958ac60..bb1753d823 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) @@ -60,7 +60,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base $this->forum_id = (int) $this->topic_data['forum_id']; // Make sure topic is either approved or user authed - if (!$this->topic_data['topic_approved'] && !$this->auth->acl_get('m_approve', $this->forum_id)) + if ($this->topic_data['topic_visibility'] != ITEM_APPROVED && !$this->auth->acl_get('m_approve', $this->forum_id)) { trigger_error('SORRY_AUTH_READ'); } |