Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #850178 by karschsp, andypost: URL argument to drupal_feed_icon() and theme_feed_icon() has url() applied twice.

merge-requests/26/head
Dries Buytaert 2010-08-03 02:02:02 +00:00
parent b601b26b77
commit f4f93b2782
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/aggregator/aggregator.pages.inc
View File

@ -13,7 +13,7 @@
* The items HTML. * The items HTML.
*/ */
function aggregator_page_last() { 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'); $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. * The rendered list of items for a category.
*/ */
function aggregator_page_category($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 // It is safe to include the cid in the query because it's loaded from the
// database by aggregator_category_load. // database by aggregator_category_load.
@ -321,7 +321,7 @@ function aggregator_page_sources() {
$feed->url = url('aggregator/sources/' . $feed->fid); $feed->url = url('aggregator/sources/' . $feed->fid);
$output .= theme('aggregator_summary_items', array('summary_items' => $summary_items, 'source' => $feed)); $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)); return theme('aggregator_wrapper', array('content' => $output));
} }

4
modules/blog/blog.pages.inc
View File

@ -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_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; return $build;
} }
@ -80,7 +80,7 @@ function blog_page_last() {
else { else {
drupal_set_message(t('No blog entries have been created.')); 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; return $build;
} }

2
modules/forum/forum.module
View File

@ -989,7 +989,7 @@ function template_preprocess_forums(&$variables) {
if ($variables['tid'] && !in_array($variables['tid'], variable_get('forum_containers', array()))) { if ($variables['tid'] && !in_array($variables['tid'], variable_get('forum_containers', array()))) {
$variables['topics'] = theme('forum_topic_list', $variables); $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 { else {
$variables['topics'] = ''; $variables['topics'] = '';

2
modules/taxonomy/taxonomy.pages.inc
View File

@ -27,7 +27,7 @@ function taxonomy_term_page($term) {
$breadcrumb[] = l(t('Home'), NULL); $breadcrumb[] = l(t('Home'), NULL);
$breadcrumb = array_reverse($breadcrumb); $breadcrumb = array_reverse($breadcrumb);
drupal_set_breadcrumb($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( $build['term_heading'] = array(
'#prefix' => '<div class="term-listing-heading">', '#prefix' => '<div class="term-listing-heading">',