From dabfefcee28b7a1e38e0fc93032512c5a2dfc53f Mon Sep 17 00:00:00 2001 From: Konstantin Obenland Date: Wed, 9 Mar 2016 21:51:27 +0000 Subject: [PATCH] Themes: Support second argument in theme support for custom logo. See #33755. Built from https://develop.svn.wordpress.org/trunk@36909 git-svn-id: http://core.svn.wordpress.org/trunk@36877 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/theme.php | 10 +++++----- wp-includes/version.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 1727a17711..ba0efbd6d3 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -1751,6 +1751,7 @@ function get_theme_support( $feature ) { $args = array_slice( func_get_args(), 1 ); switch ( $feature ) { + case 'custom-logo' : case 'custom-header' : case 'custom-background' : if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) ) @@ -1877,12 +1878,11 @@ function current_theme_supports( $feature ) { $type = $args[0]; return in_array( $type, $_wp_theme_features[$feature][0] ); + case 'custom-logo': 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] ); + case 'custom-background': + // Specific capabilities can be registered by passing an array to add_theme_support(). + return ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) && $_wp_theme_features[ $feature ][0][ $args[0] ] ); } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 2eb9fd0852..e2e0d9d408 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-beta2-36908'; +$wp_version = '4.5-beta2-36909'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.