diff options
author | Dries Buytaert <dries@buytaert.net> | 2010-08-03 02:02:02 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2010-08-03 02:02:02 +0000 |
commit | f4f93b2782d05cc49223c057e002758e47d044a7 (patch) | |
tree | 7cc04982167a230a6886f00481406d6f1e5ca56a /modules/aggregator | |
parent | b601b26b77de75501b33b3de8ecfe6db965cc61c (diff) | |
download | brdo-f4f93b2782d05cc49223c057e002758e47d044a7.tar.gz brdo-f4f93b2782d05cc49223c057e002758e47d044a7.tar.bz2 |
- Patch #850178 by karschsp, andypost: URL argument to drupal_feed_icon() and theme_feed_icon() has url() applied twice.
Diffstat (limited to 'modules/aggregator')
-rw-r--r-- | modules/aggregator/aggregator.pages.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/aggregator/aggregator.pages.inc b/modules/aggregator/aggregator.pages.inc index be4dcd1ac..92335022e 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)); } |