diff options
| author | David King <imkingdavid@gmail.com> | 2013-07-13 14:06:43 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-07-13 14:06:43 -0400 |
| commit | dfe0f6b1439ba13d433a2290a10450405428d3ef (patch) | |
| tree | 9339f82c28cf3dd3495fdbe7f8e8a184d9974fd7 /phpBB/includes/feed/forum.php | |
| parent | 3be753cd5c64b80569f9c1189b39e8e47c248d89 (diff) | |
| parent | 9d86385a362868bcd82901e1c7df18ba80eda945 (diff) | |
| download | forums-dfe0f6b1439ba13d433a2290a10450405428d3ef.tar forums-dfe0f6b1439ba13d433a2290a10450405428d3ef.tar.gz forums-dfe0f6b1439ba13d433a2290a10450405428d3ef.tar.bz2 forums-dfe0f6b1439ba13d433a2290a10450405428d3ef.tar.xz forums-dfe0f6b1439ba13d433a2290a10450405428d3ef.zip | |
Merge branch 'develop' into ticket/11215
* develop: (214 commits)
[ticket/10999] Fix assets_version in ACP
[prep-release-3.0.12] More changelog items for the 3.0.12 release.
[ticket/11687] Add assets_version to phpbb_config
[ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
[ticket/11674] Do not include vendor folder if there are no dependencies.
[ticket/11685] Remove logout confirmation page
[ticket/11684] Remove useless confirmation page after login and admin login
[ticket/9657] Define user before injecting
[ticket/9657] Remove old code
[ticket/9657] Keep approval state of posts/topics when copying them
[ticket/9657] Add functional tests for forking a copy
[ticket/9657] Add functional test for splitting topic
[ticket/11112] Do not change opensource.org link to https
[ticket/9657] Add functional test for restoring a post/topic
[ticket/11112] Use https for user-visible links to phpbb.com
[ticket/9657] Fix a little error when moving softdeleted topics
[ticket/9657] Add unit tests for softdeleting and moving posts/topics
[ticket/9657] Remove last references to m_restore permission
[ticket/9657] Fix english language :(
[ticket/9657] Notifications do not require emails or jabber anymore
...
Diffstat (limited to 'phpBB/includes/feed/forum.php')
| -rw-r--r-- | phpBB/includes/feed/forum.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/feed/forum.php b/phpBB/includes/feed/forum.php index 7670fbeaaa..b5f0dd0f8f 100644 --- a/phpBB/includes/feed/forum.php +++ b/phpBB/includes/feed/forum.php @@ -90,14 +90,12 @@ class phpbb_feed_forum extends phpbb_feed_post_base function get_sql() { - $m_approve = ($this->auth->acl_get('m_approve', $this->forum_id)) ? true : false; - // Determine topics with recent activity $sql = 'SELECT topic_id, topic_last_post_time FROM ' . TOPICS_TABLE . ' WHERE forum_id = ' . $this->forum_id . ' AND topic_moved_id = 0 - ' . ((!$m_approve) ? 'AND topic_approved = 1' : '') . ' + AND ' . $this->content_visibility->get_visibility_sql('topic', $this->forum_id) . ' ORDER BY topic_last_post_time DESC'; $result = $this->db->sql_query_limit($sql, $this->num_items); @@ -117,14 +115,14 @@ class phpbb_feed_forum extends phpbb_feed_post_base } $this->sql = array( - 'SELECT' => 'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' . + 'SELECT' => 'p.post_id, p.topic_id, p.post_time, p.post_edit_time, p.post_visibility, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' . 'u.username, u.user_id', 'FROM' => array( POSTS_TABLE => 'p', USERS_TABLE => 'u', ), 'WHERE' => $this->db->sql_in_set('p.topic_id', $topic_ids) . ' - ' . ((!$m_approve) ? 'AND p.post_approved = 1' : '') . ' + AND ' . $this->content_visibility->get_visibility_sql('post', $this->forum_id, 'p.') . ' AND p.post_time >= ' . $min_post_time . ' AND p.poster_id = u.user_id', 'ORDER_BY' => 'p.post_time DESC', |