WordPress 4.5

[autoinstalls/wordpress.git] / wp-includes / customize / class-wp-customize-image-control.php

diff --git a/wp-includes/customize/class-wp-customize-image-control.php b/wp-includes/customize/class-wp-customize-image-control.php
index dc50a3a115a3b87d04453b647a441090dc47f084..ffb89e3f4a2f09a3be874f4316ee50a803ee14a6 100644 (file)
--- a/wp-includes/customize/class-wp-customize-image-control.php
+++ b/wp-includes/customize/class-wp-customize-image-control.php
@@ -31,7 +31,7 @@ class WP_Customize_Image_Control extends WP_Customize_Upload_Control {
        public function __construct( $manager, $id, $args = array() ) {
                parent::__construct( $manager, $id, $args );
 
-               $this->button_labels = array(
+               $this->button_labels = wp_parse_args( $this->button_labels, array(
                        'select'       => __( 'Select Image' ),
                        'change'       => __( 'Change Image' ),
                        'remove'       => __( 'Remove' ),
@@ -39,7 +39,7 @@ class WP_Customize_Image_Control extends WP_Customize_Upload_Control {
                        'placeholder'  => __( 'No image selected' ),
                        'frame_title'  => __( 'Select Image' ),
                        'frame_button' => __( 'Choose Image' ),
-               );
+               ) );
        }
 
        /**