diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-23 01:17:13 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-23 01:17:13 +0200 |
| commit | 017d809e7495f86005a826ad555cbdfdbb308776 (patch) | |
| tree | 33846a7d1a43aa49202698f74f1a2bbc097f5231 /phpBB/phpbb/feed | |
| parent | 7c8e71845f5bb018f3f26378c931290e0359c494 (diff) | |
| parent | 10ba1e73da8be9920708593592ab47493de4b101 (diff) | |
| download | forums-017d809e7495f86005a826ad555cbdfdbb308776.tar forums-017d809e7495f86005a826ad555cbdfdbb308776.tar.gz forums-017d809e7495f86005a826ad555cbdfdbb308776.tar.bz2 forums-017d809e7495f86005a826ad555cbdfdbb308776.tar.xz forums-017d809e7495f86005a826ad555cbdfdbb308776.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/11733' into develop
* nickvergessen/ticket/11733:
[ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
[ticket/11733] Add browse test for feed.php
Diffstat (limited to 'phpBB/phpbb/feed')
| -rw-r--r-- | phpBB/phpbb/feed/overall.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/feed/overall.php b/phpBB/phpbb/feed/overall.php index 869df7cde0..224d97ec03 100644 --- a/phpBB/phpbb/feed/overall.php +++ b/phpBB/phpbb/feed/overall.php @@ -72,7 +72,7 @@ class phpbb_feed_overall extends phpbb_feed_post_base ), ), 'WHERE' => $this->db->sql_in_set('p.topic_id', $topic_ids) . ' - AND ' . $this->content_visibility->get_visibility_sql('post', array(), 'p.') . ' + AND ' . $this->content_visibility->get_forums_visibility_sql('post', $forum_ids, 'p.') . ' AND p.post_time >= ' . $min_post_time . ' AND u.user_id = p.poster_id', 'ORDER_BY' => 'p.post_time DESC', |