Index: pathauto.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.inc,v
retrieving revision 1.56.2.18
diff -u -p -r1.56.2.18 pathauto.inc
--- pathauto.inc	5 Jul 2010 15:52:06 -0000	1.56.2.18
+++ pathauto.inc	22 Jul 2010 04:15:54 -0000
@@ -450,16 +450,8 @@ function pathauto_create_alias($module, 
   // by the module
   if (drupal_strlen(variable_get('pathauto_' . $module . '_applytofeeds', ''))) {
     $feedappend = variable_get('pathauto_' . $module . '_applytofeeds', '');
-
-    // For forums and taxonomies, the source doesn't always form the base of the rss feed (ie. image galleries)
-    if ($module == 'taxonomy' || $module == 'forum') {
-      $update_data = _pathauto_existing_alias_data("taxonomy/term/$entity_id/$feedappend");
-      _pathauto_set_alias("taxonomy/term/$entity_id/$feedappend", "$alias/feed", $module, $entity_id, $update_data['pid'], $verbose, $update_data['old_alias'], $language);
-    }
-    else {
-      $update_data = _pathauto_existing_alias_data("$source/$feedappend");
-      _pathauto_set_alias("$source/$feedappend", "$alias/feed", $module, $entity_id, $update_data['pid'], $verbose, $update_data['old_alias'], $language);
-    }
+    $update_data = _pathauto_existing_alias_data("$source/$feedappend");
+    _pathauto_set_alias("$source/$feedappend", "$alias/feed", $module, $entity_id, $update_data['pid'], $verbose, $update_data['old_alias'], $language);
   }
 
   return $alias;
Index: pathauto_taxonomy.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto_taxonomy.inc,v
retrieving revision 1.41.2.4
diff -u -p -r1.41.2.4 pathauto_taxonomy.inc
--- pathauto_taxonomy.inc	9 Jun 2010 02:18:17 -0000	1.41.2.4
+++ pathauto_taxonomy.inc	22 Jul 2010 04:15:54 -0000
@@ -88,19 +88,17 @@ function taxonomy_pathauto_bulkupdate() 
  */
 function _taxonomy_pathauto_alias($category, $op) {
   $count = 0;
-
   $placeholders = pathauto_get_placeholders('taxonomy', $category);
-
+  $source = taxonomy_term_path($category);
   $forum_vid = variable_get('forum_nav_vocabulary', '');
+
   // If we're in a forum vocabulary, also create a forum container, forum, or forum topic alias.
-  if (module_exists('forum') && $forum_vid == (int)$category->vid) {
-    $source = 'forum/'. $category->tid;
+  if (module_exists('forum') && $forum_vid == (int) $category->vid) {
     if (pathauto_create_alias('forum', $op, $placeholders, $source, $category->tid, $category->vid)) {
       $count++;
     }
   }
   else {
-    $source = taxonomy_term_path($category);
     if (pathauto_create_alias('taxonomy', $op, $placeholders, $source, $category->tid, $category->vid)) {
       $count++;
     }