Changeset 37135

Timestamp:

03/30/2016 05:19:41 PM (9 years ago)

Author:

obenland

Message:

Template: Remove $size reference from get_custom_logo().

Argument was removed in [37077] in favor of with and height arguments.

Props ocean90.
Fixes #36327.

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (4 diffs)
• tests/phpunit/tests/general/template.php (modified) (2 diffs)

trunk/src/wp-includes/general-template.php

@@ -877 +877 @@
 
     $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.
@@ -887 +882 @@
         $html = sprintf( '<a href="%1$s" class="custom-logo-link" rel="home" itemprop="url">%2$s</a>',
             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',
             ) )
         );
@@ -897 +891 @@
     // 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( '<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo" data-size="%2$s" /></a>',
-            esc_url( home_url( '/' ) ),
-            esc_attr( $size )
+        $html = sprintf( '<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo"/></a>',
+            esc_url( home_url( '/' ) )
         );
     }
@@ -913 +906 @@
      *
      * @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 );
 }
 

trunk/tests/phpunit/tests/general/template.php

@@ -280 +280 @@
         $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',
         ) );
@@ -303 +300 @@
 
         $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',
         ) );