- #13550: Prettier RSS discovery URLs for taxonomy pages.

modules/taxonomy.module

@@ -917,6 +917,9 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
     drupal_not_found();
   }
 
+  // Needed for '+' to show up in RSS discovery URLs
+  $rss_tids = urlencode($str_tids);
+
   if ($tids) {
     // Build title:
     $result = db_query('SELECT name FROM {term_data} WHERE tid IN (%s)', implode(',', $tids));
@@ -940,10 +943,10 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
           $breadcrumbs = array_reverse($breadcrumbs);
           menu_set_location($breadcrumbs);
 
-          drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS - '. $title .'" href="'. url('taxonomy/term/'. $str_tids .'/'. $depth .'/feed') .'" />');
+          drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS - '. $title .'" href="'. url('taxonomy/term/'. $rss_tids .'/'. $depth .'/feed') .'" />');
 
           $output = taxonomy_render_nodes(taxonomy_select_nodes($tids, $operator, $depth, TRUE));
-          $output .= theme('xml_icon', url("taxonomy/term/$str_tids/$depth/feed"));
+          $output .= theme('xml_icon', url("taxonomy/term/$rss_tids/$depth/feed"));
           print theme('page', $output);
           break;
 

modules/taxonomy/taxonomy.module

@@ -917,6 +917,9 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
     drupal_not_found();
   }
 
+  // Needed for '+' to show up in RSS discovery URLs
+  $rss_tids = urlencode($str_tids);
+
   if ($tids) {
     // Build title:
     $result = db_query('SELECT name FROM {term_data} WHERE tid IN (%s)', implode(',', $tids));
@@ -940,10 +943,10 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
           $breadcrumbs = array_reverse($breadcrumbs);
           menu_set_location($breadcrumbs);
 
-          drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS - '. $title .'" href="'. url('taxonomy/term/'. $str_tids .'/'. $depth .'/feed') .'" />');
+          drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS - '. $title .'" href="'. url('taxonomy/term/'. $rss_tids .'/'. $depth .'/feed') .'" />');
 
           $output = taxonomy_render_nodes(taxonomy_select_nodes($tids, $operator, $depth, TRUE));
-          $output .= theme('xml_icon', url("taxonomy/term/$str_tids/$depth/feed"));
+          $output .= theme('xml_icon', url("taxonomy/term/$rss_tids/$depth/feed"));
           print theme('page', $output);
           break;