=== modified file 'sites/all/modules/commentrss/commentrss.pages.inc'
--- sites/all/modules/commentrss/commentrss.pages.inc	2009-09-18 14:50:44 +0000
+++ sites/all/modules/commentrss/commentrss.pages.inc	2009-09-20 12:41:52 +0000
@@ -162,12 +162,6 @@ function commentrss_format_items($nidsel
 
   $items = '';
 
-  $extra = array(
-    'pubDate' => array('key' => 'pubDate'),
-    'dc:creator' => array('key' => 'dc:creator'),
-    'guid' => array('key' => 'guid', 'attributes' => array('isPermaLink' => 'false')),
-  );
-
   // Build SQL query from the passed elements.
   $sql = 'SELECT '. $nidselector .', c.cid, c.pid, c.subject, c.comment, c.timestamp, c.uid, c.name, c.format, u.name AS username, n.title FROM {node} n '. $joins .' INNER JOIN {comments} c ON c.nid = n.nid INNER JOIN {users} u ON c.uid = u.uid WHERE '. $where .' n.status = 1 AND c.status = %d ORDER BY c.timestamp DESC';
 
@@ -191,6 +185,8 @@ function commentrss_format_items($nidsel
       $comment->name = variable_get('anonymous', 'Anonymous');
     }
 
+    $link = url('node/'. $comment->nid, array('fragment' => 'comment-'. $comment->cid, 'absolute' => TRUE));
+
     // Build up item content with node title if required.
     $content = '';
     if ($include_node_title) {
@@ -202,10 +198,21 @@ function commentrss_format_items($nidsel
     // so skip the format validation in check_markup() itself.
     $content .= check_markup($comment->comment, $comment->format, FALSE);
 
-    $link = url('node/'. $comment->nid, array('fragment' => 'comment-'. $comment->cid, 'absolute' => TRUE));
-    $extra['pubDate']['value'] = date('r', $comment->timestamp);
-    $extra['dc:creator']['value'] = $comment->name;
-    $extra['guid']['value'] = 'comment ' . $comment->cid . ' at ' . $base_url;
+    $extra = array(
+      array(
+        'key' => 'pubDate',
+        'value' => date('r', $comment->timestamp)
+      ),
+      array(
+        'key' => 'dc:creator',
+        'value' => $comment->name
+      ),
+      array(
+        'key' => 'guid',
+        'value' => 'comment ' . $comment->cid . ' at ' . $base_url,
+        'attributes' => array('isPermaLink' => 'false')
+      )
+    );
 
     $items .= format_rss_item($comment->subject, $link, $content, $extra);
   }

