From 3949fb7e9019626b13c7cb62b862833c1f47fcfa Mon Sep 17 00:00:00 2001 From: azaozz Date: Mon, 19 Jan 2009 05:04:58 +0000 Subject: [PATCH] Add support for automatic feed links in themes, props Viper007Bond, see #8878 git-svn-id: http://svn.automattic.com/wordpress/trunk@10377 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/classic/functions.php | 3 + wp-content/themes/classic/header.php | 4 -- wp-content/themes/default/functions.php | 17 ++--- wp-content/themes/default/header.php | 2 - wp-includes/default-filters.php | 1 + wp-includes/feed-atom-comments.php | 2 +- wp-includes/feed-atom.php | 2 +- wp-includes/feed-rdf.php | 2 +- wp-includes/feed-rss.php | 2 +- wp-includes/feed-rss2-comments.php | 2 +- wp-includes/feed-rss2.php | 2 +- wp-includes/feed.php | 23 +++++++ wp-includes/general-template.php | 82 +++++++++++++++++++++++++ wp-includes/link-template.php | 2 +- 14 files changed, 126 insertions(+), 20 deletions(-) diff --git a/wp-content/themes/classic/functions.php b/wp-content/themes/classic/functions.php index 40d4a46f8e..1bc06e22ad 100644 --- a/wp-content/themes/classic/functions.php +++ b/wp-content/themes/classic/functions.php @@ -3,6 +3,9 @@ * @package WordPress * @subpackage Classic_Theme */ + +automatic_feed_links(); + if ( function_exists('register_sidebar') ) register_sidebar(array( 'before_widget' => '
  • ', diff --git a/wp-content/themes/classic/header.php b/wp-content/themes/classic/header.php index e08c95d05b..a9ca0dd8bd 100644 --- a/wp-content/themes/classic/header.php +++ b/wp-content/themes/classic/header.php @@ -16,10 +16,6 @@ @import url( ); - - - - diff --git a/wp-content/themes/default/functions.php b/wp-content/themes/default/functions.php index 340d23c333..65172166ba 100644 --- a/wp-content/themes/default/functions.php +++ b/wp-content/themes/default/functions.php @@ -4,13 +4,16 @@ * @subpackage Default_Theme */ -if ( function_exists('register_sidebar') ) - register_sidebar(array( - 'before_widget' => '
  • ', - 'after_widget' => '
  • ', - 'before_title' => '

    ', - 'after_title' => '

    ', - )); +automatic_feed_links(); + +if ( function_exists('register_sidebar') ) { + register_sidebar(array( + 'before_widget' => '
  • ', + 'after_widget' => '
  • ', + 'before_title' => '

    ', + 'after_title' => '

    ', + )); +} /** @ignore */ function kubrick_head() { diff --git a/wp-content/themes/default/header.php b/wp-content/themes/default/header.php index 558689f624..1dd3b59641 100644 --- a/wp-content/themes/default/header.php +++ b/wp-content/themes/default/header.php @@ -13,8 +13,6 @@ <?php wp_title('«', true, 'right'); ?> <?php bloginfo('name'); ?> - -