From e7f970e26d636d69ea742bf591dc5fc9dc15a0a9 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 16 Apr 2014 23:41:10 +0200 Subject: [ticket/12413] Fatal Error for feed.php?mode=forums https://tracker.phpbb.com/browse/PHPBB3-12413 http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=45475 PHPBB3-12413 --- phpBB/phpbb/feed/topic.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/phpbb/feed/topic.php') diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php index a7acfb502f..3c2b3405f6 100644 --- a/phpBB/phpbb/feed/topic.php +++ b/phpBB/phpbb/feed/topic.php @@ -83,6 +83,8 @@ class topic extends \phpbb\feed\post_base unset($forum_ids_passworded); } + + $this->fetch_attachments(); } function get_sql() -- cgit v1.2.1 From 80b4a7f33726280f523ee84f11f11e852ef71db7 Mon Sep 17 00:00:00 2001 From: Nicofuma Date: Tue, 29 Apr 2014 23:27:43 +0200 Subject: [ticket/12413] Fix coding style PHPBB3-12413 --- phpBB/phpbb/feed/topic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/phpbb/feed/topic.php') diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php index 3c2b3405f6..627ae1ffeb 100644 --- a/phpBB/phpbb/feed/topic.php +++ b/phpBB/phpbb/feed/topic.php @@ -37,6 +37,8 @@ class topic extends \phpbb\feed\post_base function open() { + parent::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_posts_approved, t.topic_type FROM ' . TOPICS_TABLE . ' t LEFT JOIN ' . FORUMS_TABLE . ' f @@ -83,8 +85,6 @@ class topic extends \phpbb\feed\post_base unset($forum_ids_passworded); } - - $this->fetch_attachments(); } function get_sql() -- cgit v1.2.1 From 21e2f5c517040e872507c0f6d7e2c10c8a8f51b2 Mon Sep 17 00:00:00 2001 From: Nicofuma Date: Tue, 29 Apr 2014 23:49:04 +0200 Subject: [ticket/12413] Move parent:open() call to the end of the function PHPBB3-12413 --- phpBB/phpbb/feed/topic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/phpbb/feed/topic.php') diff --git a/phpBB/phpbb/feed/topic.php b/phpBB/phpbb/feed/topic.php index 627ae1ffeb..fb49aa65cc 100644 --- a/phpBB/phpbb/feed/topic.php +++ b/phpBB/phpbb/feed/topic.php @@ -37,8 +37,6 @@ class topic extends \phpbb\feed\post_base function open() { - parent::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_posts_approved, t.topic_type FROM ' . TOPICS_TABLE . ' t LEFT JOIN ' . FORUMS_TABLE . ' f @@ -85,6 +83,8 @@ class topic extends \phpbb\feed\post_base unset($forum_ids_passworded); } + + parent::open(); } function get_sql() -- cgit v1.2.1