diff options
| author | Nicofuma <github@nicofuma.fr> | 2014-04-29 23:49:04 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2014-05-02 13:25:49 +0200 |
| commit | 21e2f5c517040e872507c0f6d7e2c10c8a8f51b2 (patch) | |
| tree | 0e5f0d157de02df2881ddf4d37f7467b9f310f36 /phpBB/phpbb/feed | |
| parent | ff2d26e7e8e9aa47fdbc40aada5bef3d5f07d034 (diff) | |
| download | forums-21e2f5c517040e872507c0f6d7e2c10c8a8f51b2.tar forums-21e2f5c517040e872507c0f6d7e2c10c8a8f51b2.tar.gz forums-21e2f5c517040e872507c0f6d7e2c10c8a8f51b2.tar.bz2 forums-21e2f5c517040e872507c0f6d7e2c10c8a8f51b2.tar.xz forums-21e2f5c517040e872507c0f6d7e2c10c8a8f51b2.zip | |
[ticket/12413] Move parent:open() call to the end of the function
PHPBB3-12413
Diffstat (limited to 'phpBB/phpbb/feed')
| -rw-r--r-- | phpBB/phpbb/feed/forum.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/feed/topic.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/feed/forum.php b/phpBB/phpbb/feed/forum.php index 5699a2632c..8e6490923d 100644 --- a/phpBB/phpbb/feed/forum.php +++ b/phpBB/phpbb/feed/forum.php @@ -37,8 +37,6 @@ class forum extends \phpbb\feed\post_base function open() { - parent::open(); - // Check if forum exists $sql = 'SELECT forum_id, forum_name, forum_password, forum_type, forum_options FROM ' . FORUMS_TABLE . ' @@ -82,6 +80,8 @@ class forum extends \phpbb\feed\post_base unset($forum_ids_passworded); } + + parent::open(); } function get_sql() 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() |