Changeset 13398

Timestamp:

02/25/2010 08:56:19 AM (15 years ago)

Author:

dd32

Message:

Deprecate automatic_feed_links() in favor of add_theme_support('automatic-feed-links'). Props Viper007Bond. Fixes #12364

Location:

trunk

Files:

• wp-content/themes/classic/functions.php (modified) (1 diff)
• wp-content/themes/default/functions.php (modified) (1 diff)
• wp-content/themes/twentyten/functions.php (modified) (2 diffs)
• wp-includes/default-filters.php (modified) (2 diffs)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)

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

@@ -5 +5 @@
  */
 
-automatic_feed_links();
+add_theme_support( 'automatic-feed-links' );
 
 if ( function_exists('register_sidebar') )

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

@@ -7 +7 @@
 $content_width = 450;
 
-automatic_feed_links();
+add_theme_support( 'automatic-feed-links' );
 
 if ( function_exists('register_sidebar') ) {

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

@@ -3 +3 @@
 // Set the content width based on the Theme CSS
 if ( ! isset( $content_width ) )
-   $content_width = 640;
+    $content_width = 640;
 
 if ( ! function_exists( 'twentyten_init' ) ) :
@@ -27 +27 @@
     set_post_thumbnail_size( HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true );
 
-    // Add default posts and comments RSS feed links to head.
-    automatic_feed_links();
+    // Add default posts and comments RSS feed links to head
+    add_theme_support( 'automatic-feed-links' );
 
     // Make theme available for translation

trunk/wp-includes/default-filters.php

@@ -169 +169 @@
 
 // Actions
-add_action( 'wp_head',             'wp_enqueue_scripts',             1    );
-add_action( 'wp_head',             'feed_links_extra',               3    );
+add_action( 'wp_head',             'wp_enqueue_scripts',            1     );
+add_action( 'wp_head',             'feed_links',                    3     );
+add_action( 'wp_head',             'feed_links_extra',              3     );
 add_action( 'wp_head',             'rsd_link'                             );
 add_action( 'wp_head',             'wlwmanifest_link'                     );
@@ -179 +180 @@
 add_action( 'wp_head',             'locale_stylesheet'                    );
 add_action( 'publish_future_post', 'check_and_publish_future_post', 10, 1 );
-add_action( 'wp_head',             'noindex',                        1    );
-add_action( 'wp_head',             'wp_print_styles',                8    );
-add_action( 'wp_head',             'wp_print_head_scripts',          9    );
+add_action( 'wp_head',             'noindex',                       1     );
+add_action( 'wp_head',             'wp_print_styles',               8     );
+add_action( 'wp_head',             'wp_print_head_scripts',         9     );
 add_action( 'wp_head',             'wp_generator'                         );
 add_action( 'wp_head',             'rel_canonical'                        );

trunk/wp-includes/deprecated.php

@@ -2413 +2413 @@
     return true;
 }
+
+/**
+ * Enable automatic general feed link outputting.
+ *
+ * @since 2.8.0
+ * @deprecated 3.0.0
+ * @deprecated Use add_theme_support( 'automatic-feed-links' )
+ */
+function automatic_feed_links() {
+    _deprecated_function( __FUNCTION__, '3.0', "add_theme_support( 'automatic-feed-links' )" );
+    add_theme_support( 'automatic-feed-links' );
+}

trunk/wp-includes/general-template.php

@@ -1563 +1563 @@
 
 /**
- * Enable/disable automatic general feed link outputting.
+ * Display the links to the general feeds.
  *
  * @since 2.8.0
  *
- * @param boolean $add Optional, default is true. 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 = array() ) {
+    if ( !current_theme_supports('automatic-feed-links') )
+        return;
+
     $defaults = array(
         /* translators: Separator between blog name and feed type in feed links */