diff --git a/modules/aggregator/aggregator.pages.inc b/modules/aggregator/aggregator.pages.inc index be4dcd1ac54b76fd69bcaaee3820087aa0a7f6ef..92335022efda9f77b4e3d8e8d183c485174e6b4d 100644 --- a/modules/aggregator/aggregator.pages.inc +++ b/modules/aggregator/aggregator.pages.inc @@ -13,7 +13,7 @@ * The items HTML. */ function aggregator_page_last() { - drupal_add_feed(url('aggregator/rss'), variable_get('site_name', 'Drupal') . ' ' . t('aggregator')); + drupal_add_feed('aggregator/rss', variable_get('site_name', 'Drupal') . ' ' . t('aggregator')); $items = aggregator_feed_items_load('sum'); @@ -65,7 +65,7 @@ function aggregator_page_source_form($form, $form_state, $feed) { * The rendered list of items for a category. */ function aggregator_page_category($category) { - drupal_add_feed(url('aggregator/rss/' . $category['cid']), variable_get('site_name', 'Drupal') . ' ' . t('aggregator - @title', array('@title' => $category['title']))); + drupal_add_feed('aggregator/rss/' . $category['cid'], variable_get('site_name', 'Drupal') . ' ' . t('aggregator - @title', array('@title' => $category['title']))); // It is safe to include the cid in the query because it's loaded from the // database by aggregator_category_load. @@ -321,7 +321,7 @@ function aggregator_page_sources() { $feed->url = url('aggregator/sources/' . $feed->fid); $output .= theme('aggregator_summary_items', array('summary_items' => $summary_items, 'source' => $feed)); } - $output .= theme('feed_icon', array('url' => url('aggregator/opml'), 'title' => t('OPML feed'))); + $output .= theme('feed_icon', array('url' => 'aggregator/opml', 'title' => t('OPML feed'))); return theme('aggregator_wrapper', array('content' => $output)); } diff --git a/modules/blog/blog.pages.inc b/modules/blog/blog.pages.inc index 587fbbf29ba05edda8b6b1a1f3a852fb13c423b4..eea45e4dd23f4ca374534edd599bf039cee920ba 100644 --- a/modules/blog/blog.pages.inc +++ b/modules/blog/blog.pages.inc @@ -45,7 +45,7 @@ function blog_page_user($account) { drupal_set_message(t('!author has not created any blog entries.', array('!author' => theme('username', array('account' => $account))))); } } - drupal_add_feed(url('blog/' . $account->uid . '/feed'), t('RSS - !title', array('!title' => $title))); + drupal_add_feed('blog/' . $account->uid . '/feed', t('RSS - !title', array('!title' => $title))); return $build; } @@ -80,7 +80,7 @@ function blog_page_last() { else { drupal_set_message(t('No blog entries have been created.')); } - drupal_add_feed(url('blog/feed'), t('RSS - blogs')); + drupal_add_feed('blog/feed', t('RSS - blogs')); return $build; } diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 8c1b8dc749e942a8016ed23a1acd66adb220fb31..3036f6afddeb5f479133b4a3ff47bcfe31067d7a 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -989,7 +989,7 @@ function template_preprocess_forums(&$variables) { if ($variables['tid'] && !in_array($variables['tid'], variable_get('forum_containers', array()))) { $variables['topics'] = theme('forum_topic_list', $variables); - drupal_add_feed(url('taxonomy/term/' . $variables['tid'] . '/0/feed'), 'RSS - ' . $title); + drupal_add_feed('taxonomy/term/' . $variables['tid'] . '/0/feed', 'RSS - ' . $title); } else { $variables['topics'] = ''; diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc index 0bb19d76f5ce5aa10cb7cfb8e58f896f0e600751..e4a6fad76dc337917ac16a1fb190a6d75ce50e25 100644 --- a/modules/taxonomy/taxonomy.pages.inc +++ b/modules/taxonomy/taxonomy.pages.inc @@ -27,7 +27,7 @@ function taxonomy_term_page($term) { $breadcrumb[] = l(t('Home'), NULL); $breadcrumb = array_reverse($breadcrumb); drupal_set_breadcrumb($breadcrumb); - drupal_add_feed(url('taxonomy/term/' . $term->tid . '/feed'), 'RSS - ' . $term->name); + drupal_add_feed('taxonomy/term/' . $term->tid . '/feed', 'RSS - ' . $term->name); $build['term_heading'] = array( '#prefix' => '
',