Changeset 10377

Timestamp:

01/19/2009 05:04:58 AM (16 years ago)

Author:

azaozz

Message:

Add support for automatic feed links in themes, props Viper007Bond, see #8878

Location:

trunk

Files:

• wp-content/themes/classic/functions.php (modified) (1 diff)
• wp-content/themes/classic/header.php (modified) (1 diff)
• wp-content/themes/default/functions.php (modified) (1 diff)
• wp-content/themes/default/header.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/feed-atom-comments.php (modified) (1 diff)
• wp-includes/feed-atom.php (modified) (1 diff)
• wp-includes/feed-rdf.php (modified) (1 diff)
• wp-includes/feed-rss.php (modified) (1 diff)
• wp-includes/feed-rss2-comments.php (modified) (1 diff)
• wp-includes/feed-rss2.php (modified) (1 diff)
• wp-includes/feed.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)

trunk/wp-content/themes/classic/functions.php

@@ -4 +4 @@
  * @subpackage Classic_Theme
  */
+
+automatic_feed_links();
+
 if ( function_exists('register_sidebar') )
     register_sidebar(array(

trunk/wp-content/themes/classic/header.php

@@ -17 +17 @@
     </style>
 
-    <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('rss2_url'); ?>" />
-    <link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>" />
-    <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="<?php bloginfo('atom_url'); ?>" />
-
     <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
     <?php wp_get_archives('type=monthly&format=link'); ?>

trunk/wp-content/themes/default/functions.php

@@ -5 +5 @@
  */
 
-if ( function_exists('register_sidebar') )
-    register_sidebar(array(
-        'before_widget' => '<li id="%1$s" class="widget %2$s">',
-        'after_widget' => '</li>',
-        'before_title' => '<h2 class="widgettitle">',
-        'after_title' => '</h2>',
-    ));
+automatic_feed_links();
+
+if ( function_exists('register_sidebar') ) {
+    register_sidebar(array(
+        'before_widget' => '<li id="%1$s" class="widget %2$s">',
+        'after_widget' => '</li>',
+        'before_title' => '<h2 class="widgettitle">',
+        'after_title' => '</h2>',
+    ));
+}
 
 /** @ignore */

trunk/wp-content/themes/default/header.php

@@ -14 +14 @@
 
 <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
-<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
-<link rel="alternate" type="application/atom+xml" title="<?php bloginfo('name'); ?> Atom Feed" href="<?php bloginfo('atom_url'); ?>" />
 <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
 

trunk/wp-includes/default-filters.php

@@ -165 +165 @@
 
 // Actions
+add_action('wp_head', 'feed_links_extra', 3);
 add_action('wp_head', 'rsd_link');
 add_action('wp_head', 'wlwmanifest_link');

trunk/wp-includes/feed-atom-comments.php

@@ -6 +6 @@
  */
 
-header('Content-Type: application/atom+xml; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true);
 echo '<?xml version="1.0" encoding="' . get_option('blog_charset') . '" ?' . '>';
 ?>

trunk/wp-includes/feed-atom.php

@@ -6 +6 @@
  */
 
-header('Content-Type: application/atom+xml; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;
 

trunk/wp-includes/feed-rdf.php

@@ -6 +6 @@
  */
 
-header('Content-Type: application/rdf+xml; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rdf') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;
 

trunk/wp-includes/feed-rss.php

@@ -6 +6 @@
  */
 
-header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rss') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;
 

trunk/wp-includes/feed-rss2-comments.php

@@ -6 +6 @@
  */
 
-header('Content-Type: text/xml;charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';

trunk/wp-includes/feed-rss2.php

@@ -6 +6 @@
  */
 
-header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;
 

trunk/wp-includes/feed.php

@@ -509 +509 @@
 }
 
+/**
+ * Return the content type for specified feed type.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.8.0
+ */
+function feed_content_type( $type = '' ) {
+    if ( empty($type) )
+        $type = get_default_feed();
+
+    $types = array(
+        'rss'  => 'application/rss+xml',
+        'rss2' => 'application/rss+xml',
+        'atom' => 'application/atom+xml',
+        'rdf'  => 'application/rdf+xml',
+    );
+
+    $content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';
+
+    return apply_filters( 'feed_content_type', $content_type, $type );
+}
+
 ?>

trunk/wp-includes/general-template.php

@@ -1370 +1370 @@
 
 /**
+ * Enable/disable automatic general feed link outputting.
+ *
+ * @since 2.8.0
+ *
+ * @param boolean $add Add or remove links. Defaults to true.
+ */
+function automatic_feed_links( $add = true ) {
+    if ( $add )
+        add_action( 'wp_head', 'feed_links', 2 );
+    else {
+        remove_action( 'wp_head', 'feed_links', 2 );
+        remove_action( 'wp_head', 'feed_links_extra', 3 );
+    }
+}
+
+/**
+ * Display the links to the general feeds.
+ *
+ * @since 2.8.0
+ *
+ * @param array $args Optional arguments.
+ */
+function feed_links( $args ) {
+    $defaults = array(
+        'seperator'   => _c('»|Seperator character feed titles in theme head'),
+        'rsstitle'    => __('%s Feed'),
+        'comstitle'   => __('%s Comments Feed'),
+    );
+
+    $args = wp_parse_args( $args, $defaults );
+
+    echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . sprintf( $args['rsstitle'], get_bloginfo('name') ) . '" href="' . get_feed_link() . "\" />\n";
+    echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . sprintf( $args['comstitle'], get_bloginfo('name') ) . '" href="' . get_feed_link( 'comments_' . get_default_feed() ) . "\" />\n";
+}
+
+/**
+ * Display the links to the extra feeds such as category feeds.
+ *
+ * @since 2.8.0
+ *
+ * @param array $args Optional arguments.
+ */
+function feed_links_extra( $args ) {
+    $defaults = array(
+        'seperator'   => _c('&raquo;|Seperator character feed titles in theme head'),
+        'singletitle' => __('%1$s %2$s %3$s Comments Feed'),
+        'cattitle'    => __('%1$s %2$s %3$s Category Feed'),
+        'tagtitle'    => __('%1$s %2$s %3$s Tag Feed'),
+        'authortitle' => __('%1$s %2$s Posts by %3$s Feed'),
+        'searchtitle' => __('%1$s %2$s Search Results for &quot;%3$s&quot; Feed'),
+    );
+
+    $args = wp_parse_args( $args, $defaults );
+
+    if ( is_single() || is_page() ) {
+        $post = &get_post( $id = 0 );
+        if ( comments_open() || pings_open() || $post->comment_count > 0 )
+            echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . sprintf( $args['singletitle'], get_bloginfo('name'), $args['seperator'], get_the_title() ) . '" href="' . get_post_comments_feed_link( $post->ID ) . "\" />\n";
+    }
+
+    elseif ( is_category() ) {
+        $cat_id = intval( get_query_var('cat') );
+        echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . sprintf( $args['cattitle'], get_bloginfo('name'), $args['seperator'], get_cat_name( $cat_id ) ) . '" href="' . get_category_feed_link( $cat_id ) . "\" />\n";
+    }
+
+    elseif ( is_tag() ) {
+        $tag_id = intval( get_query_var('tag_id') );
+        $tag = get_tag( $tag_id );
+        echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . sprintf( $args['tagtitle'], get_bloginfo('name'), $args['seperator'], $tag->name ) . '" href="' . get_tag_feed_link( $tag_id ) . "\" />\n";
+    }
+
+    elseif ( is_author() ) {
+        $author_id = intval( get_query_var('author') );
+        echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . sprintf( $args['authortitle'], get_bloginfo('name'), $args['seperator'], get_author_name( $author_id ) ) . '" href="' . get_author_feed_link( $author_id ) . "\" />\n";
+    }
+
+    elseif ( is_search() ) {
+        echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . sprintf( $args['searchtitle'], get_bloginfo('name'), $args['seperator'], get_search_query() ) . '" href="' . get_search_feed_link() . "\" />\n";
+    }
+}
+
+/**
  * Display the link to the Really Simple Discovery service endpoint.
  *

trunk/wp-includes/link-template.php

@@ -508 +508 @@
 
     if ( '' == $permalink_structure ) {
-        $link = get_option('home') . "?feed=$feed&cat=" . $cat_id;
+        $link = trailingslashit( get_option('home') ) . "?feed=$feed&cat=" . $cat_id;
     } else {
         $link = get_category_link($cat_id);