Changeset 36950

Timestamp:

03/10/2016 07:02:25 PM (9 years ago)

Author:

obenland

Message:

Template: Explicitly set full as the default custom logo size.

See #33755.

Location:

trunk

Files:

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

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

@@ -878 +878 @@
     $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.

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

@@ -281 +281 @@
         $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",
@@ -303 +304 @@
         $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",