Refactor the comment_rss::feed() method to eliminate code duplication.

1 files changed, 13 insertions, 17 deletions

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)) {