Changeset 37077

Timestamp:

03/24/2016 02:01:50 AM (9 years ago)

Author:

obenland

Message:

Customize: Bring custom-logo args closer to custom-header.

Allows themes to specify the desired width and height of logos, and whether
that is flexible or not. Has the benefit of not having to generate a logo-sized
file for every image uploaded.

Props westonruter, celloexpressions.
Fixes #36255.

Location:

trunk/src

Files:

• wp-content/themes/twentyfifteen/functions.php (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)

trunk/src/wp-content/themes/twentyfifteen/functions.php

@@ -109 +109 @@
      * @since Twenty Fifteen 1.5
      */
-    add_image_size( 'twentyfifteen-logo', 248, 248 );
-    add_theme_support( 'custom-logo', array( 'size' => 'twentyfifteen-logo' ) );
+    add_theme_support( 'custom-logo', array(
+        'height'      => 248,
+        'width'       => 248,
+        'flex-height' => true,
+    ) );
 
     $color_scheme  = twentyfifteen_get_color_scheme();

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -1960 +1960 @@
         ) );
 
-        $this->add_control( new WP_Customize_Media_Control( $this, 'custom_logo', array(
-            'label'    => __( 'Logo' ),
-            'section'  => 'title_tagline',
-            'priority' => 8,
-            'mime_type' => 'image',
+        $custom_logo_args = get_theme_support( 'custom-logo' );
+        $this->add_control( new WP_Customize_Cropped_Image_Control( $this, 'custom_logo', array(
+            'label'         => __( 'Logo' ),
+            'section'       => 'title_tagline',
+            'priority'      => 8,
+            'height'        => $custom_logo_args[0]['height'],
+            'width'         => $custom_logo_args[0]['width'],
+            'flex_height'   => $custom_logo_args[0]['flex-height'],
+            'flex_width'    => $custom_logo_args[0]['flex-width'],
             'button_labels' => array(
                 'select'       => __( 'Select logo' ),

trunk/src/wp-includes/theme.php

@@ -1560 +1560 @@
             break;
 
+        case 'custom-logo':
+            $defaults = array(
+                'width'       => null,
+                'height'      => null,
+                'flex-width'  => false,
+                'flex-height' => false,
+                'header-text' => '',
+            );
+            $args[0] = wp_parse_args( array_intersect_key( $args[0], $defaults ), $defaults );
+
+            // Allow full flexibility if no size is specified.
+            if ( is_null( $args[0]['width'] ) && is_null( $args[0]['height'] ) ) {
+                $args[0]['flex-width']  = true;
+                $args[0]['flex-height'] = true;
+            }
+            break;
+
         case 'custom-header-uploads' :
             return add_theme_support( 'custom-header', array( 'uploads' => true ) );