Index: commentrss.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/commentrss/commentrss.module,v
retrieving revision 1.12.2.2
diff -u -F^f -r1.12.2.2 commentrss.module
--- commentrss.module	16 Jul 2007 04:19:11 -0000	1.12.2.2
+++ commentrss.module	28 Jan 2008 04:11:38 -0000
@@ -47,27 +47,30 @@ function commentrss_menu($may_cache) {
       'type' => MENU_CALLBACK);
   }
   else {
-    if (arg(0) == 'node' && is_numeric(arg(1)) && variable_get('commentrss_node', TRUE)) {
-      $node = node_load(arg(1));
-      if ($node->nid && $node->comment != COMMENT_NODE_DISABLED) {
-        drupal_add_feed(url('crss/node/'. $node->nid),
-          t('Comments for @title', array('@title' => $node->title)));
+    if (arg(0) == 'node') {
+      if (variable_get('commentrss_site', TRUE)) {
+        drupal_add_feed(url('crss'),
+          t('@site - All comments', array('@site' => variable_get('site_name', 'Drupal'))));
+      }
+
+      if (is_numeric(arg(1)) && variable_get('commentrss_node', TRUE)) {
+        $node = node_load(arg(1));
+        if ($node->nid && $node->comment != COMMENT_NODE_DISABLED) {
+          drupal_add_feed(url('crss/node/'. $node->nid),
+           t('@site - Comments for @title', array('@site' => variable_get('site_name', 'Drupal'), '@title' => $node->title)));
+        }
       }
-    }
-    elseif (arg(0) == 'node' && variable_get('commentrss_site', TRUE)) {
-      drupal_add_feed(url('crss'),
-        t('@site - All comments', array('@site' => variable_get('site_name', 'Drupal'))));
     }
     elseif (arg(0) == 'taxonomy' && arg(1) == 'term' && is_numeric(arg(2)) && variable_get('commentrss_term', FALSE)) {
       $term = taxonomy_get_term(arg(2));
       if ($term->tid) {
         drupal_add_feed(url('crss/term/'. $term->tid),
-          t('Comments for category "@title"', array('@title' => $term->name)));
+          t('@site - Comments for category "@title"', array('@site' => variable_get('site_name', 'Drupal'), '@title' => $term->name)));
       }
     }
-    elseif (arg(0) == 'taxonomy' && arg(1) == 'vocabulary' && is_numeric(arg(2)) && variable_get('commentrss_node', FALSE)) {
+    elseif (arg(0) == 'taxonomy' && arg(1) == 'vocabulary' && is_numeric(arg(2)) && variable_get('commentrss_vocab', FALSE)) {
       // vocabulary_list module is serving this page
-      drupal_add_feed(url('crss/vocab/'. arg(2)), t('Comments for this vocabulary'));
+      drupal_add_feed(url('crss/vocab/'. arg(2)), t('@site - Comments for this vocabulary', array('@site' => variable_get('site_name', 'Drupal'))));
     }
   }
   return $items;