diff --git a/includes/common.inc b/includes/common.inc index 0248d0e..34b49c2 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -347,17 +347,16 @@ function drupal_get_html_head() { * * This function can be called as long the HTML header hasn't been sent. * - * @param $path_or_external_url - * The internal path or external URL of the feed. This should be either a raw - * path (not having passed through url()) or an external URL. + * @param $url + * A url for the feed. * @param $title * The title of the feed. */ -function drupal_add_feed($path_or_external_url = NULL, $title = '') { +function drupal_add_feed($url = NULL, $title = '') { $stored_feed_links = &drupal_static(__FUNCTION__, array()); - if (isset($path_or_external_url)) { - $stored_feed_links[$path_or_external_url] = theme('feed_icon', array('url' => $path_or_external_url, 'title' => $title)); + if (isset($url)) { + $stored_feed_links[$url] = theme('feed_icon', array('url' => $url, 'title' => $title)); drupal_add_html_head_link(array( 'rel' => 'alternate', @@ -365,10 +364,9 @@ function drupal_add_feed($path_or_external_url = NULL, $title = '') { 'title' => $title, // Force the URL to be absolute, for consistency with other tags // output by Drupal. - 'href' => url($path_or_external_url, array('absolute' => TRUE)), + 'href' => url($url, array('absolute' => TRUE)), )); } - return $stored_feed_links; } @@ -744,7 +742,7 @@ function drupal_access_denied() { * call may take. The default is 30 seconds. If a timeout occurs, the error * code is set to the HTTP_REQUEST_TIMEOUT constant. * - context: A context resource created with stream_context_create(). - * + * * @return object * An object that can have one or more of the following components: * - request: A string containing the request body that was sent. diff --git a/includes/theme.inc b/includes/theme.inc index 9f1c0c0..3839e1e 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -1866,8 +1866,7 @@ function theme_more_help_link($variables) { * * @param $variables * An associative array containing: - * - url: The internal path or external URL of the feed. This should be - * either a raw path (not having passed through url()) or an external URL. + * - url: The url of the feed. * - title: A descriptive title of the feed. */ function theme_feed_icon($variables) { diff --git a/modules/forum/forum.module b/modules/forum/forum.module index ef81236..0a5a8f9 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -982,7 +982,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('taxonomy/term/' . $variables['tid'] . '/feed', 'RSS - ' . $title); + drupal_add_feed('taxonomy/term/' . $variables['tid'] . '/0/feed', 'RSS - ' . $title); } else { $variables['topics'] = '';