diff --git a/modules/comment.module b/modules/comment.module
index 68bdab53a019edeb407a3f5a62b5d420ac283265..e18a7d685e42f0443304cf7323dc7d0f897c61aa 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -163,18 +163,21 @@ function comment_block($op = 'list', $delta = 0) {
     return $blocks;
   }
   else if ($op == 'view' && user_access('access comments')) {
-    $result = db_query_range(db_rewrite_sql('SELECT c.nid, c.* FROM {comments} c INNER JOIN {node} n ON n.nid = c.nid WHERE n.status = 1 AND c.status = %d ORDER BY c.timestamp DESC', 'c'), COMMENT_PUBLISHED, 0, 10);
-    $items = array();
-    while ($comment = db_fetch_object($result)) {
-      $items[] = l($comment->subject, 'node/'. $comment->nid, NULL, NULL, 'comment-'. $comment->cid) .'<br />'. t('%time ago', array('%time' => format_interval(time() - $comment->timestamp)));
-    }
-
     $block['subject'] = t('Recent comments');
-    $block['content'] = theme('item_list', $items);
+    $block['content'] = theme('comment_block');
     return $block;
   }
 }
 
+function theme_comment_block() {
+  $result = db_query_range(db_rewrite_sql('SELECT c.nid, c.* FROM {comments} c INNER JOIN {node} n ON n.nid = c.nid WHERE n.status = 1 AND c.status = %d ORDER BY c.timestamp DESC', 'c'), COMMENT_PUBLISHED, 0, 10);
+  $items = array();
+  while ($comment = db_fetch_object($result)) {
+    $items[] = l($comment->subject, 'node/'. $comment->nid, NULL, NULL, 'comment-'. $comment->cid) .'<br />'. t('%time ago', array('%time' => format_interval(time() - $comment->timestamp)));
+  }
+  return theme('item_list', $items);
+}
+
 /**
  * Implementation of hook_link().
  */
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 68bdab53a019edeb407a3f5a62b5d420ac283265..e18a7d685e42f0443304cf7323dc7d0f897c61aa 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -163,18 +163,21 @@ function comment_block($op = 'list', $delta = 0) {
     return $blocks;
   }
   else if ($op == 'view' && user_access('access comments')) {
-    $result = db_query_range(db_rewrite_sql('SELECT c.nid, c.* FROM {comments} c INNER JOIN {node} n ON n.nid = c.nid WHERE n.status = 1 AND c.status = %d ORDER BY c.timestamp DESC', 'c'), COMMENT_PUBLISHED, 0, 10);
-    $items = array();
-    while ($comment = db_fetch_object($result)) {
-      $items[] = l($comment->subject, 'node/'. $comment->nid, NULL, NULL, 'comment-'. $comment->cid) .'<br />'. t('%time ago', array('%time' => format_interval(time() - $comment->timestamp)));
-    }
-
     $block['subject'] = t('Recent comments');
-    $block['content'] = theme('item_list', $items);
+    $block['content'] = theme('comment_block');
     return $block;
   }
 }
 
+function theme_comment_block() {
+  $result = db_query_range(db_rewrite_sql('SELECT c.nid, c.* FROM {comments} c INNER JOIN {node} n ON n.nid = c.nid WHERE n.status = 1 AND c.status = %d ORDER BY c.timestamp DESC', 'c'), COMMENT_PUBLISHED, 0, 10);
+  $items = array();
+  while ($comment = db_fetch_object($result)) {
+    $items[] = l($comment->subject, 'node/'. $comment->nid, NULL, NULL, 'comment-'. $comment->cid) .'<br />'. t('%time ago', array('%time' => format_interval(time() - $comment->timestamp)));
+  }
+  return theme('item_list', $items);
+}
+
 /**
  * Implementation of hook_link().
  */