diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
index 2ba72a38f3..aaff39ef20 100644
--- a/src/wp-includes/general-template.php
+++ b/src/wp-includes/general-template.php
@@ -876,29 +876,22 @@ function get_custom_logo( $blog_id = 0 ) {
}
$custom_logo_id = get_theme_mod( 'custom_logo' );
- $size = get_theme_support( 'custom-logo', 'size' );
-
- if ( ! $size ) {
- $size = 'full';
- }
// We have a logo. Logo is go.
if ( $custom_logo_id ) {
$html = sprintf( '%2$s',
esc_url( home_url( '/' ) ),
- wp_get_attachment_image( $custom_logo_id, $size, false, array(
- 'class' => "custom-logo attachment-$size",
- 'data-size' => $size,
- 'itemprop' => 'logo',
+ wp_get_attachment_image( $custom_logo_id, 'full', false, array(
+ 'class' => 'custom-logo',
+ 'itemprop' => 'logo',
) )
);
}
// If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
elseif ( is_customize_preview() ) {
- $html = sprintf( '
',
- esc_url( home_url( '/' ) ),
- esc_attr( $size )
+ $html = sprintf( '
',
+ esc_url( home_url( '/' ) )
);
}
@@ -912,9 +905,8 @@ function get_custom_logo( $blog_id = 0 ) {
* @since 4.5.0
*
* @param string $html Custom logo HTML output.
- * @param string $size Size specified in add_theme_support declaration, or 'full' default.
*/
- return apply_filters( 'get_custom_logo', $html, $size );
+ return apply_filters( 'get_custom_logo', $html );
}
/**
diff --git a/tests/phpunit/tests/general/template.php b/tests/phpunit/tests/general/template.php
index 2c9a0b9861..5d4b92135f 100644
--- a/tests/phpunit/tests/general/template.php
+++ b/tests/phpunit/tests/general/template.php
@@ -279,11 +279,8 @@ class Tests_General_Template extends WP_UnitTestCase {
$this->_set_custom_logo();
$home_url = get_home_url( $blog_id, '/' );
- $size = get_theme_support( 'custom-logo', 'size' );
- $size = $size ? $size : 'full';
- $image = wp_get_attachment_image( $this->custom_logo_id, $size, false, array(
- 'class' => "custom-logo attachment-$size",
- 'data-size' => $size,
+ $image = wp_get_attachment_image( $this->custom_logo_id, 'full', false, array(
+ 'class' => 'custom-logo',
'itemprop' => 'logo',
) );
restore_current_blog();
@@ -302,11 +299,8 @@ class Tests_General_Template extends WP_UnitTestCase {
the_custom_logo();
$this->_set_custom_logo();
- $size = get_theme_support( 'custom-logo', 'size' );
- $size = $size ? $size : 'full';
- $image = wp_get_attachment_image( $this->custom_logo_id, $size, false, array(
- 'class' => "custom-logo attachment-$size",
- 'data-size' => $size,
+ $image = wp_get_attachment_image( $this->custom_logo_id, 'full', false, array(
+ 'class' => 'custom-logo',
'itemprop' => 'logo',
) );