From 6fbc8a645f20b25a0af684bb18175f7ca4a2ddde Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Tue, 9 Dec 2014 15:21:13 +0200 Subject: [PATCH] getActiveForumTopics() method fixed --- src/bb-library/Model/ForumTopicTable.php | 28 ++++++++++-------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/bb-library/Model/ForumTopicTable.php b/src/bb-library/Model/ForumTopicTable.php index c99f1af28..274d69c52 100644 --- a/src/bb-library/Model/ForumTopicTable.php +++ b/src/bb-library/Model/ForumTopicTable.php @@ -28,9 +28,20 @@ class Model_ForumTopicTable implements \Box\InjectionAwareInterface { return $this->di; } + public function getActiveForumTopics(Model_Forum $forum) { - return $this->getActiveForumTopicsQuery($forum)->execute(); + $query = "SELECT * FROM forum_topic ft + LEFT JOIN forum_topic_message ftm ON ftm.forum_topic_id = ft.id + WHERE ft.forum_id = :forum_id + AND ft.status IN ('active', 'locked') + ORDER BY ftm.created_at DESC"; + + $bindings = array( + ':forum_id' => $forum->id + ); + + return $this->di['db']->exec($query, $bindings); } public function getSearchQuery($data) @@ -73,22 +84,7 @@ class Model_ForumTopicTable implements \Box\InjectionAwareInterface return $this->di['db']->find('ForumTopic', "id IN (:ids) AND status IN ('active', 'locked')", $bindings); } - - public function getActiveForumTopicsQuery(Model_Forum $forum) - { - $query = "SELECT * FROM forum_topic ft - LEFT JOIN forum_topic_message ftm ON ftm.forum_topic_id = ft.id - WHERE ft.forum_id = :forum_id - AND ft.status IN ('active', 'locked') - ORDER BY ftm.created_at DESC"; - $bindings = array( - ':forum_id' => $forum->id - ); - - return array($query, $bindings); - } - public function findTopic($slug) { $query = "SELECT ft.*, f.* FROM forum_topic ft