diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/aggregator/aggregator.module | 5 | ||||
| -rw-r--r-- | modules/blog/blog.module | 6 | ||||
| -rw-r--r-- | modules/forum/forum.module | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 4 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index bcd08b8ef..e32f95c99 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -1085,11 +1085,12 @@ function aggregator_page_list($sql, $header, $categorize) { // arg(1) is undefined if we are at the top aggregator URL // is there a better way to do this? if (!arg(1)) { - $form['feed_icon'] = array('#value' => theme('feed_icon', url('aggregator/rss'))); + drupal_add_feed(url('aggregator/rss')); } elseif (arg(1) == 'categories' && arg(2) && !arg(3)) { - $form['feed_icon'] = array('#value' => theme('feed_icon', url('aggregator/rss/' . arg(2)))); + drupal_add_feed(url('aggregator/rss/'. arg(2))); } + return $form; } diff --git a/modules/blog/blog.module b/modules/blog/blog.module index b4892e738..b0227e66d 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -163,7 +163,7 @@ function blog_page_user($uid) { $output .= node_view(node_load($node->nid), 1); } $output .= theme('pager', NULL, variable_get('default_nodes_main', 10)); - $output .= theme('feed_icon', url("blog/$account->uid/feed")); + drupal_add_feed(url('blog/'. $account->uid .'/feed')); drupal_add_link(array('rel' => 'alternate', 'type' => 'application/rss+xml', @@ -190,7 +190,7 @@ function blog_page_last() { $output .= node_view(node_load($node->nid), 1); } $output .= theme('pager', NULL, variable_get('default_nodes_main', 10)); - $output .= theme('feed_icon', url('blog/feed')); + drupal_add_feed(url('blog/feed')); drupal_add_link(array('rel' => 'alternate', 'type' => 'application/rss+xml', @@ -310,5 +310,3 @@ function blog_block($op = 'list', $delta = 0) { } } } - - diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 71cf6c960..32dc7ebe1 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -936,7 +936,7 @@ function theme_forum_display($forums, $topics, $parents, $tid, $sortby, $forum_p 'href' => url('taxonomy/term/'. $tid .'/0/feed'))); $output .= theme('forum_topic_list', $tid, $topics, $sortby, $forum_per_page); - $output .= theme('feed_icon', url("taxonomy/term/$tid/0/feed")); + drupal_add_feed(url('taxonomy/term/'. $tid .'/0/feed')); } $output .= '</div>'; } diff --git a/modules/node/node.module b/modules/node/node.module index b8ed3c4e2..237354ab8 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2256,10 +2256,12 @@ function node_page_default() { $result = pager_query(db_rewrite_sql('SELECT n.nid, n.sticky, n.created FROM {node} n WHERE n.promote = 1 AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC'), variable_get('default_nodes_main', 10)); if (db_num_rows($result)) { + $feed_url = url('rss.xml', NULL, NULL, TRUE); + drupal_add_feed($feed_url); drupal_add_link(array('rel' => 'alternate', 'type' => 'application/rss+xml', 'title' => t('RSS'), - 'href' => url('rss.xml', NULL, NULL, TRUE))); + 'href' => $feed_url)); $output = ''; while ($node = db_fetch_object($result)) { diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 6d93a43fc..18ba091b3 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -1257,7 +1257,7 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') { 'href' => url('taxonomy/term/'. $str_tids .'/'. $depth .'/feed'))); $output = taxonomy_render_nodes(taxonomy_select_nodes($tids, $terms['operator'], $depth, TRUE)); - $output .= theme('feed_icon', url('taxonomy/term/'. $str_tids .'/'. $depth .'/feed')); + drupal_add_feed(url('taxonomy/term/'. $str_tids .'/'. $depth .'/feed')); return $output; break; |