WordPress.org
Get WordPress

Make WordPress Core

Ticket #36255: 36255.2-alt.diff

File 36255.2-alt.diff, 2.2 KB (added by westonruter, 10 years ago)

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

    diff --git src/wp-includes/class-wp-customize-manager.php src/wp-includes/class-wp-customize-manager.php
index ea30b93..6bf1707 100644
    final class WP_Customize_Manager { 
    18331833         * Register some default controls.
    18341834         *
    18351835         * @since 3.4.0
     1836         *
     1837         * @global array $_wp_additional_image_sizes
    18361838         */
    18371839        public function register_controls() {
     1840                global $_wp_additional_image_sizes;
    18381841
    18391842                /* Panel, Section, and Control Types */
    18401843                $this->register_panel_type( 'WP_Customize_Panel' );
    … … final class WP_Customize_Manager { 
    19621965                        'transport'      => 'postMessage',
    19631966                ) );
    19641967
    1965                 $this->add_control( new WP_Customize_Media_Control( $this, 'custom_logo', array(
     1968                $custom_logo_control_args = array(
    19661969                        'label'    => __( 'Logo' ),
    19671970                        'section'  => 'title_tagline',
    19681971                        'priority' => 8,
    1969                         'mime_type' => 'image',
    19701972                        'button_labels' => array(
    19711973                                'select'       => __( 'Select logo' ),
    19721974                                'change'       => __( 'Change logo' ),
    … … final class WP_Customize_Manager { 
    19761978                                'frame_title'  => __( 'Select logo' ),
    19771979                                'frame_button' => __( 'Choose logo' ),
    19781980                        ),
    1979                 ) ) );
     1981                );
     1982                $custom_logo_size = get_theme_support( 'custom-logo', 'size' );
     1983                if ( empty( $custom_logo_size ) || ! has_image_size( $custom_logo_size ) ) {
     1984                        $custom_logo_control_class = 'WP_Customize_Media_Control';
     1985                        $custom_logo_control_args['mime'] = 'image';
     1986                } else {
     1987                        $custom_logo_control_class = 'WP_Customize_Cropped_Image_Control';
     1988                        $custom_logo_control_args['width'] = $_wp_additional_image_sizes[ $custom_logo_size ]['width'];
     1989                        $custom_logo_control_args['height'] = $_wp_additional_image_sizes[ $custom_logo_size ]['height'];
     1990                        $custom_logo_control_args['flex_width'] = empty( $_wp_additional_image_sizes[ $custom_logo_size ]['crop'] );
     1991                        $custom_logo_control_args['flex_height'] = empty( $_wp_additional_image_sizes[ $custom_logo_size ]['crop'] );
     1992                }
     1993                $this->add_control( new $custom_logo_control_class( $this, 'custom_logo', $custom_logo_control_args ) );
    19801994
    19811995                if ( isset( $this->selective_refresh ) ) {
    19821996                        $this->selective_refresh->add_partial( 'custom_logo', array(