Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.301
diff -u -F^f -r1.301 aggregator.module
--- modules/aggregator/aggregator.module	23 Aug 2006 05:55:37 -0000	1.301
+++ modules/aggregator/aggregator.module	23 Aug 2006 18:28:34 -0000
@@ -1030,6 +1030,8 @@ function aggregator_admin_overview() {
  * Menu callback; displays the most recent items gathered from any feed.
  */
 function aggregator_page_last() {
+  drupal_add_feed(url('aggregator/rss'), variable_get('site_name', 'drupal') . ' ' . t('aggregator'));
+  
   return _aggregator_page_list('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC', arg(1));
 }
 
@@ -1048,7 +1050,9 @@ function aggregator_page_source() {
  */
 function aggregator_page_category() {
   $category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2)));
-
+  
+  drupal_add_feed(url('aggregator/rss/'. arg(2)), variable_get('site_name', 'drupal') . ' ' . t('aggregator - @title', array('@title' => $category->title)));
+  
   return _aggregator_page_list('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = '. $category->cid .' ORDER BY timestamp DESC, iid DESC', arg(3));
 }
 
@@ -1082,14 +1086,6 @@ function aggregator_page_list($sql, $hea
   }
   $form['submit'] = array('#type' => 'submit', '#value' => t('Save categories'));
   $form['pager'] = array('#value' => theme('pager', NULL, 20, 0));
-  // arg(1) is undefined if we are at the top aggregator URL
-  // is there a better way to do this?
-  if (!arg(1)) {
-    drupal_add_feed(url('aggregator/rss'));
-  }
-  elseif (arg(1) == 'categories' && arg(2) && !arg(3)) {
-    drupal_add_feed(url('aggregator/rss/'. arg(2)));
-  }
 
   return $form;
 }
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.684
diff -u -F^f -r1.684 node.module
--- modules/node/node.module	23 Aug 2006 07:23:09 -0000	1.684
+++ modules/node/node.module	23 Aug 2006 18:28:36 -0000
@@ -2257,7 +2257,7 @@ function node_page_default() {
 
   if (db_num_rows($result)) {
     $feed_url = url('rss.xml', NULL, NULL, TRUE);
-    drupal_add_feed($feed_url, t('RSS'));
+    drupal_add_feed($feed_url, variable_get('site_name', 'drupal') .' '. t('RSS'));
 
     $output = '';
     while ($node = db_fetch_object($result)) {