? _29326_rssxml.patch
? modules/devel
? sites/morbus.totalnetnh.net.drupal
Index: database/database.mysql
===================================================================
RCS file: /cvs/drupal/drupal/database/database.mysql,v
retrieving revision 1.208
diff -u -r1.208 database.mysql
--- database/database.mysql	6 Dec 2005 12:16:38 -0000	1.208
+++ database/database.mysql	7 Dec 2005 15:40:49 -0000
@@ -863,8 +863,6 @@
 
 INSERT INTO locales_meta (locale, name, enabled, isdefault) VALUES ('en', 'English', '1', '1');
 
-INSERT INTO url_alias (src, dst) VALUES ('node/feed', 'rss.xml');
-
 INSERT INTO variable (name, value) VALUES ('node_options_forum', 'a:1:{i:0;s:6:"status";}');
 
 INSERT INTO menu VALUES (2, 0, '', 'Primary links', '', 0, 115);
Index: database/database.pgsql
===================================================================
RCS file: /cvs/drupal/drupal/database/database.pgsql,v
retrieving revision 1.151
diff -u -r1.151 database.pgsql
--- database/database.pgsql	6 Dec 2005 12:16:38 -0000	1.151
+++ database/database.pgsql	7 Dec 2005 15:40:49 -0000
@@ -856,8 +856,6 @@
 
 INSERT INTO locales_meta (locale, name, enabled, isdefault) VALUES ('en', 'English', '1', '1');
 
-INSERT INTO url_alias (src, dst) VALUES ('node/feed', 'rss.xml');
-
 INSERT INTO variable (name, value) VALUES ('node_options_forum', 'a:1:{i:0;s:6:"status";}');
 
 INSERT INTO menu VALUES (2, 0, '', 'Primary links', '', 0, 115);
Index: database/updates.inc
===================================================================
RCS file: /cvs/drupal/drupal/database/updates.inc,v
retrieving revision 1.153
diff -u -r1.153 updates.inc
--- database/updates.inc	6 Dec 2005 09:25:03 -0000	1.153
+++ database/updates.inc	7 Dec 2005 15:40:49 -0000
@@ -4,7 +4,7 @@
 function system_version($type) {
   switch ($type) {
     case SCHEMA:
-      return 155;
+      return 157;
 
     case SCHEMA_MIN:
       return 110;
@@ -1100,3 +1100,10 @@
   system_themes();
   return array();
 }
+
+function system_update_157() {
+  $ret = array();
+  $ret[] = update_sql("DELETE FROM {url_alias} WHERE src = 'node/feed' AND dst = 'rss.xml'");
+  $ret[] = update_sql("INSERT INTO {url_alias} (src, dst) VALUES ('rss.xml', 'node/feed')");
+}
+
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.559
diff -u -r1.559 node.module
--- modules/node.module	5 Dec 2005 09:11:33 -0000	1.559
+++ modules/node.module	7 Dec 2005 15:40:50 -0000
@@ -886,6 +886,10 @@
       'access' => user_access('access content'),
       'type' => MENU_ITEM_GROUPING,
       'weight' => 1);
+    $items[] = array('path' => 'rss.xml', 'title' => t('rss feed'),
+      'callback' => 'node_feed',
+      'access' => user_access('access content'),
+      'type' => MENU_CALLBACK);
   }
   else {
     if (arg(0) == 'node' && is_numeric(arg(1))) {
@@ -1375,7 +1379,7 @@
   }
   else if ($op == 'view') {
     $block['subject'] = t('Syndicate');
-    $block['content'] = theme('xml_icon', url('node/feed'));
+    $block['content'] = theme('xml_icon', url('rss.xml'));
 
     return $block;
   }
@@ -1916,7 +1920,7 @@
     drupal_add_link(array('rel' => 'alternate',
                           'type' => 'application/rss+xml',
                           'title' => t('RSS'),
-                          'href' => url('node/feed', NULL, NULL, TRUE)));
+                          'href' => url('rss.xml', NULL, NULL, TRUE)));
 
     $output = '';
     while ($node = db_fetch_object($result)) {
@@ -1947,9 +1951,6 @@
   }
 
   switch ($op) {
-    case 'feed':
-      node_feed();
-      return;
     case 'view':
       if (is_numeric(arg(1))) {
         $node = node_load(arg(1), $_GET['revision']);