diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2015-08-28 10:39:07 +0200 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2015-08-28 10:39:07 +0200 |
| commit | e8219e8610d37dc6fe3c15a5f9c4ab2664335ed7 (patch) | |
| tree | 4da29c32130850ca1f2cd934cbf8d55cbcc52a10 /phpBB/phpbb/feed/overall.php | |
| parent | 6dc195e5a7a521478502680d4fb168ec03e13422 (diff) | |
| parent | c9ec16f6149f104c016980375c8fd04a31e57616 (diff) | |
| download | forums-e8219e8610d37dc6fe3c15a5f9c4ab2664335ed7.tar forums-e8219e8610d37dc6fe3c15a5f9c4ab2664335ed7.tar.gz forums-e8219e8610d37dc6fe3c15a5f9c4ab2664335ed7.tar.bz2 forums-e8219e8610d37dc6fe3c15a5f9c4ab2664335ed7.tar.xz forums-e8219e8610d37dc6fe3c15a5f9c4ab2664335ed7.zip | |
Merge pull request #3470 from Nicofuma/ticket/13645
[ticket/13645] Move the feeds to controllers
Diffstat (limited to 'phpBB/phpbb/feed/overall.php')
| -rw-r--r-- | phpBB/phpbb/feed/overall.php | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/phpBB/phpbb/feed/overall.php b/phpBB/phpbb/feed/overall.php index ab452f5386..40cf94ace0 100644 --- a/phpBB/phpbb/feed/overall.php +++ b/phpBB/phpbb/feed/overall.php @@ -1,27 +1,30 @@ <?php /** -* -* This file is part of the phpBB Forum Software package. -* -* @copyright (c) phpBB Limited <https://www.phpbb.com> -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ + * + * This file is part of the phpBB Forum Software package. + * + * @copyright (c) phpBB Limited <https://www.phpbb.com> + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ namespace phpbb\feed; /** -* Board wide feed (aka overall feed) -* -* This will give you the newest {$this->num_items} posts -* from the whole board. -*/ -class overall extends \phpbb\feed\post_base + * Board wide feed (aka overall feed) + * + * This will give you the newest {$this->num_items} posts + * from the whole board. + */ +class overall extends post_base { - function get_sql() + /** + * {@inheritdoc} + */ + protected function get_sql() { $forum_ids = array_diff($this->get_readable_forums(), $this->get_excluded_forums(), $this->get_passworded_forums()); if (empty($forum_ids)) @@ -55,8 +58,8 @@ class overall extends \phpbb\feed\post_base // Get the actual data $this->sql = array( 'SELECT' => 'f.forum_id, f.forum_name, ' . - '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, p.post_attachment, ' . - 'u.username, u.user_id', + '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, p.post_attachment, ' . + 'u.username, u.user_id', 'FROM' => array( USERS_TABLE => 'u', POSTS_TABLE => 'p', @@ -77,7 +80,10 @@ class overall extends \phpbb\feed\post_base return true; } - function adjust_item(&$item_row, &$row) + /** + * {@inheritdoc} + */ + public function adjust_item(&$item_row, &$row) { parent::adjust_item($item_row, $row); |