- All comments of an item can now be seen /comments?item_id=

- Return proper Content-Type header for GET /comments requests
- Got rid of the query processing for index() in REST_Controller()
- Small misc fixes

1 files changed, 10 insertions, 2 deletions

diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index e474bf65..e9628a01 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -105,17 +105,25 @@ class Comment_Core {
     return $block;
   }
 
-  static function get_comments($item, $output_format) {
-    $comments = ORM::factory('comment')->where('item_id', $item->id)
+  // @todo Set proper Content-Type in a central place (REST_Controller::dispatch?).
+  static function get_comments($item_id, $output_format) {
+    $comments = ORM::factory('comment')->where('item_id', $item_id)
       ->orderby('datetime', 'asc')
       ->find_all();
 
+    if (!$comments->count()) {
+      header("HTTP/1.1 400 Bad Request");
+      return;
+    }
+
     switch ($output_format) {
     case "xml":
+      header("Content-Type: application/xml");
       return xml::to_xml($comments, array("comments", "comment"));
       break;
 
     case "json":
+      header("Content-Type: application/json");
       foreach ($comments as $comment) {
         $data[] = $comment->as_array();
       }