diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/aggregator.module | 3 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.module | 3 | ||||
| -rw-r--r-- | modules/blog.module | 2 | ||||
| -rw-r--r-- | modules/blog/blog.module | 2 | ||||
| -rw-r--r-- | modules/node.module | 3 | ||||
| -rw-r--r-- | modules/node/node.module | 3 | ||||
| -rw-r--r-- | modules/taxonomy.module | 2 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 2 |
8 files changed, 14 insertions, 6 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module index e7c807961..da9ecb4da 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -729,8 +729,7 @@ function aggregator_page_opml() { $output .= "</body>\n"; $output .= "</opml>\n"; - header("Content-Type: text/xml"); - + drupal_set_header("Content-Type: text/xml; charset=utf-8"); print $output; } diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index e7c807961..da9ecb4da 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -729,8 +729,7 @@ function aggregator_page_opml() { $output .= "</body>\n"; $output .= "</opml>\n"; - header("Content-Type: text/xml"); - + drupal_set_header("Content-Type: text/xml; charset=utf-8"); print $output; } diff --git a/modules/blog.module b/modules/blog.module index eb0a52d79..5ee3470ce 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -125,6 +125,7 @@ function blog_page_user($uid) { $output .= theme('pager', NULL, variable_get("default_nodes_main", 10)); $output .= theme('xml_icon', url("blog/feed/$account->uid")); + drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS - '. $title .'" href="'. url("blog/feed/$account->uid") .'">'); print theme("page", $output, $title); } @@ -141,6 +142,7 @@ function blog_page_last() { $output .= theme('pager', NULL, variable_get("default_nodes_main", 10)); $output .= theme('xml_icon', url('blog/feed')); + drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS - blogs" href="'. url('blog/feed') .'">'); print theme("page", $output); } diff --git a/modules/blog/blog.module b/modules/blog/blog.module index eb0a52d79..5ee3470ce 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -125,6 +125,7 @@ function blog_page_user($uid) { $output .= theme('pager', NULL, variable_get("default_nodes_main", 10)); $output .= theme('xml_icon', url("blog/feed/$account->uid")); + drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS - '. $title .'" href="'. url("blog/feed/$account->uid") .'">'); print theme("page", $output, $title); } @@ -141,6 +142,7 @@ function blog_page_last() { $output .= theme('pager', NULL, variable_get("default_nodes_main", 10)); $output .= theme('xml_icon', url('blog/feed')); + drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS - blogs" href="'. url('blog/feed') .'">'); print theme("page", $output); } diff --git a/modules/node.module b/modules/node.module index 7f1b2a532..0800cb94f 100644 --- a/modules/node.module +++ b/modules/node.module @@ -964,7 +964,7 @@ function node_feed($nodes = 0, $channel = array()) { $output .= format_rss_channel($channel["title"], $channel["link"], $channel["description"], $items, $channel["language"]); $output .= "</rss>\n"; - header("Content-Type: text/xml"); + drupal_set_header("Content-Type: text/xml; charset=utf-8"); print $output; } @@ -1506,6 +1506,7 @@ function node_page() { $output .= node_view(node_load(array("nid" => $node->nid, "type" => $node->type)), 1); } $output .= theme('pager', NULL, variable_get("default_nodes_main", 10)); + drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS" href="'. url('node/feed') .'">'); print theme("page", $output, ""); } } diff --git a/modules/node/node.module b/modules/node/node.module index 7f1b2a532..0800cb94f 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -964,7 +964,7 @@ function node_feed($nodes = 0, $channel = array()) { $output .= format_rss_channel($channel["title"], $channel["link"], $channel["description"], $items, $channel["language"]); $output .= "</rss>\n"; - header("Content-Type: text/xml"); + drupal_set_header("Content-Type: text/xml; charset=utf-8"); print $output; } @@ -1506,6 +1506,7 @@ function node_page() { $output .= node_view(node_load(array("nid" => $node->nid, "type" => $node->type)), 1); } $output .= theme('pager', NULL, variable_get("default_nodes_main", 10)); + drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS" href="'. url('node/feed') .'">'); print theme("page", $output, ""); } } diff --git a/modules/taxonomy.module b/modules/taxonomy.module index cc6f92ec5..40b3e3472 100644 --- a/modules/taxonomy.module +++ b/modules/taxonomy.module @@ -751,6 +751,8 @@ function taxonomy_page() { $breadcrumbs[] = l(t('Home'), ''); $breadcrumbs = array_reverse($breadcrumbs); + drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS - '. implode(' : ', $names) .'" href="'. url("taxonomy/feed/or/$taxonomy->str_tids") .'">'); + $output = taxonomy_render_nodes(taxonomy_select_nodes($taxonomy)); print theme("page", $output, implode(', ', $names), $breadcrumbs); break; diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index cc6f92ec5..40b3e3472 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -751,6 +751,8 @@ function taxonomy_page() { $breadcrumbs[] = l(t('Home'), ''); $breadcrumbs = array_reverse($breadcrumbs); + drupal_set_html_head('<link rel="alternate" type="application/rss+xml" title="RSS - '. implode(' : ', $names) .'" href="'. url("taxonomy/feed/or/$taxonomy->str_tids") .'">'); + $output = taxonomy_render_nodes(taxonomy_select_nodes($taxonomy)); print theme("page", $output, implode(', ', $names), $breadcrumbs); break; |