From ce2fde5d37f7dd3972eafb644a9ff38532c4bae1 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 15 Jun 2009 21:35:14 -0700 Subject: Refactor the comment_rss::feed() method to eliminate code duplication. --- modules/comment/helpers/comment_rss.php | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'modules/comment/helpers') diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php index afcc275c..ef2d176e 100644 --- a/modules/comment/helpers/comment_rss.php +++ b/modules/comment/helpers/comment_rss.php @@ -29,24 +29,20 @@ class comment_rss_Core { } static function feed($feed_id, $offset, $limit, $id) { - switch ($feed_id) { - case "newest": - $comments = ORM::factory("comment") - ->where("state", "published") - ->orderby("created", "DESC"); - $all_comments = ORM::factory("comment") - ->where("state", "published") - ->orderby("created", "DESC"); - break; + if ($feed_id != "newest" && $feed_id != "item") { + return; + } + + $comments = ORM::factory("comment") + ->where("state", "published") + ->orderby("created", "DESC"); + $all_comments = ORM::factory("comment") + ->where("state", "published") + ->orderby("created", "DESC"); - case "item": - $comments = ORM::factory("comment") - ->where("state", "published") - ->orderby("created", "DESC") - ->where("item_id", $id); - $all_comments = ORM::factory("comment") - ->where("state", "published") - ->where("item_id", $id); + if ($feed_id == "item") { + $comments->where("item_id", $id); + $all_comments->where("item_id", $id); } if (!empty($comments)) { -- cgit v1.2.3