Ticket #12739: remove_theme_support-ugly.diff

theme.php

@@ -1531 +1531 @@
 /**
  * Allows a theme to register its support of a certain feature
  *
- * Must be called in the themes functions.php file to work.
+ * Must be called in the theme's functions.php file to work.
+ * If attached to a hook, it must be after_setup_theme.
+ * The init hook may be too late for some features.
  *
  * @since 2.9.0
  * @param string $feature the feature being added
@@ -1548 +1550 @@
 /**
  * Allows a theme to de-register its support of a certain feature
  *
- * Must be called in the themes functions.php file to work.
+ * Should be called in the theme's functions.php file. Generally would
+ * be used for child themes to override support from the parent theme.
  *
  * @since 3.0.0
+ * @see add_theme_support()
  * @param string $feature the feature being added
  */
 function remove_theme_support( $feature ) {
+        // Blacklist: for internal registrations not used directly by themes.
+        if ( in_array( $feature, array( 'custom-background', 'custom-header', 'editor-style', 'widgets' ) ) )
+                return false;
+
         global $_wp_theme_features;
 
-        unset($_wp_theme_features[$feature]);
+        if ( ! isset( $_wp_theme_features[$feature] ) )
+                return false;
+
+        if ( func_num_args() == 1 ) {
+                unset( $_wp_theme_features[$feature] );
+                return true;
+        }
+
+        // @todo pluggable arg checking. see current_theme_supports()
+        $args = array_slice( func_get_args(), 1 );
+        switch( $feature ) {
+                case 'post-thumbnails' :
+                        if ( true === $_wp_theme_features[$feature] ) {
+                                global $_wp_post_type_features;
+                                $post_types = array();
+
+                                foreach ( (array) $_wp_post_type_features as $post_type => $features ) {
+                                        if ( ! isset( $features['thumbnail'] ) )
+                                                continue;
+                                        $post_types[] = $post_type;
+                                }
+                        } else {
+                                $post_types = $_wp_theme_features[$feature][0];
+                        }
+                        $_wp_theme_features[$feature] = array_diff( $post_types, $args[0] );
+                        return true;
+                break;
+        }
 }
 
 /**