Changeset 13399

Timestamp:

02/25/2010 11:09:34 AM (13 years ago)

Author:

dd32

Message:

Restore backwards compatibility in automatic_feed_links() to deregister the extra feeds. Props Viper007Bond. See #12364

Location:

trunk/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• deprecated.php (modified) (1 diff)

trunk/wp-includes/default-filters.php

@@ -170 +170 @@
 // Actions
 add_action( 'wp_head',             'wp_enqueue_scripts',            1     );
-add_action( 'wp_head',             'feed_links',                    3     );
+add_action( 'wp_head',             'feed_links',                    2     );
 add_action( 'wp_head',             'feed_links_extra',              3     );
 add_action( 'wp_head',             'rsd_link'                             );

trunk/wp-includes/deprecated.php

@@ -2415 +2415 @@
 
 /**
- * Enable automatic general feed link outputting.
+ * Enable/disable 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() {
+ *
+ * @param boolean $add Optional, default is true. Add or remove links. Defaults to true.
+ */
+function automatic_feed_links( $add = true ) {
     _deprecated_function( __FUNCTION__, '3.0', "add_theme_support( 'automatic-feed-links' )" );
-    add_theme_support( 'automatic-feed-links' );
-}
+
+    if ( $add )
+        add_theme_support( 'automatic-feed-links' );
+    else
+        remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+
+}