1 files changed, 7 insertions, 11 deletions
diff --git a/phpBB/phpbb/feed/forum.php b/phpBB/phpbb/feed/forum.php
index b5f0dd0f8f..8e6490923d 100644
--- a/phpBB/phpbb/feed/forum.php
+++ b/phpBB/phpbb/feed/forum.php
@@ -7,13 +7,7 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\feed;
 
 /**
 * Forum feed
@@ -23,7 +17,7 @@ if (!defined('IN_PHPBB'))
 *
 * @package phpBB3
 */
-class phpbb_feed_forum extends phpbb_feed_post_base
+class forum extends \phpbb\feed\post_base
 {
 	var $forum_id		= 0;
 	var $forum_data		= array();
@@ -32,9 +26,9 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 	* Set the Forum ID
 	*
 	* @param int	$forum_id			Forum ID
-	* @return	phpbb_feed_forum
+	* @return	\phpbb\feed\forum
 	*/
-	public function set_forum_id($topic_id)
+	public function set_forum_id($forum_id)
 	{
 		$this->forum_id = (int) $forum_id;
 
@@ -86,6 +80,8 @@ class phpbb_feed_forum extends phpbb_feed_post_base
 
 			unset($forum_ids_passworded);
 		}
+
+		parent::open();
 	}
 
 	function get_sql()
@@ -115,7 +111,7 @@ 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_visibility, 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, p.post_attachment, ' .
 							'u.username, u.user_id',
 			'FROM'		=> array(
 				POSTS_TABLE		=> 'p',