Ticket #21912: 21912.001.patch

wp-includes/theme.php

@@ -1485 +1485 @@
 /**
  * Checks a theme's support for a given feature
  *
+ * @global array $_wp_theme_features
  * @since 2.9.0
  * @param string $feature the feature being checked
  * @return boolean
@@ -1495 +1496 @@
         if ( 'custom-header-uploads' == $feature )
                 return current_theme_supports( 'custom-header', 'uploads' );
 
-        if ( !isset( $_wp_theme_features[$feature] ) )
-                return false;
+        $args   = func_get_args();
+        $retval = true;
 
-        // If no args passed then no extra checks need be performed
-        if ( func_num_args() <= 1 )
-                return true;
+        if ( ! isset( $_wp_theme_features[$feature] ) )
+                $retval = false;
 
-        $args = array_slice( func_get_args(), 1 );
+        // If args passed, extra checks need to be performed
+        if ( $retval && func_num_args() > 1 ) {
+                $args = array_slice( $args, 1 );
 
-        switch ( $feature ) {
-                case 'post-thumbnails':
-                        // post-thumbnails can be registered for only certain content/post types by passing
-                        // an array of types to add_theme_support(). If no array was passed, then
-                        // any type is accepted
-                        if ( true === $_wp_theme_features[$feature] )  // Registered for all types
-                                return true;
-                        $content_type = $args[0];
-                        return in_array( $content_type, $_wp_theme_features[$feature][0] );
-                        break;
+                switch ( $feature ) {
+                        case 'post-thumbnails':
+                                // post-thumbnails can be registered for only certain content/post types by passing
+                                // an array of types to add_theme_support(). If no array was passed, then
+                                // any type is accepted
+                                if ( true === $_wp_theme_features[$feature] ) {
+                                        // Registered for all types
+                                        $retval = true;
+                                        break;
+                                }
 
-                case 'post-formats':
-                        // specific post formats can be registered by passing an array of types to
-                        // add_theme_support()
-                        $post_format = $args[0];
-                        return in_array( $post_format, $_wp_theme_features[$feature][0] );
-                        break;
+                                $retval = in_array( $args[0], $_wp_theme_features[$feature][0] );
+                                break;
 
-                case 'custom-header':
-                case 'custom-background' :
-                        // specific custom header and background capabilities can be registered by passing
-                        // an array to add_theme_support()
-                        $header_support = $args[0];
-                        return ( isset( $_wp_theme_features[$feature][0][$header_support] ) && $_wp_theme_features[$feature][0][$header_support] );
-                        break;
+                        case 'post-formats':
+                                // specific post formats can be registered by passing an array of types to
+                                // add_theme_support()
+                                $retval = in_array( $args[0], $_wp_theme_features[$feature][0] );
+                                break;
+
+                        case 'custom-header':
+                        case 'custom-background' :
+                                // specific custom header and background capabilities can be registered by passing
+                                // an array to add_theme_support()
+                                $retval = ! empty( $_wp_theme_features[$feature][0][$args[0]] );
+                                break;
+                }
         }
 
-        return apply_filters('current_theme_supports-' . $feature, true, $args, $_wp_theme_features[$feature]);
+        return apply_filters( "current_theme_supports-{$feature}", $retval, $args, $_wp_theme_features[$feature] );
 }
 
 /**