Changeset 36769

Timestamp:

02/29/2016 12:39:33 AM (10 years ago)

Author:

westonruter

Message:

Customize: Allow button_labels to be overridden in $args passed to WP_Customize_Media_Control and WP_Customize_Image_Control.

Props chetanchauhan, celloexpressions.
See #33755.
Fixes #35542.

Location:

trunk/src/wp-includes/customize

Files:

• class-wp-customize-image-control.php (modified) (2 diffs)
• class-wp-customize-media-control.php (modified) (4 diffs)

trunk/src/wp-includes/customize/class-wp-customize-image-control.php

@@ -32 +32 @@
                 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' ),
@@ -40 +40 @@
                         'frame_title'  => __( 'Select Image' ),
                         'frame_button' => __( 'Choose Image' ),
-                );
+                ) );
         }
 

trunk/src/wp-includes/customize/class-wp-customize-media-control.php

@@ -56 +56 @@
                 parent::__construct( $manager, $id, $args );
 
-                $this->button_labels = array(
-                        'select'       => __( 'Select File' ),
-                        'change'       => __( 'Change File' ),
-                        'default'      => __( 'Default' ),
-                        'remove'       => __( 'Remove' ),
-                        'placeholder'  => __( 'No file selected' ),
-                        'frame_title'  => __( 'Select File' ),
-                        'frame_button' => __( 'Choose File' ),
-                );
+                if ( ! ( $this instanceof WP_Customize_Image_Control ) ) {
+                        $this->button_labels = wp_parse_args( $this->button_labels, array(
+                                'select'       => __( 'Select File' ),
+                                'change'       => __( 'Change File' ),
+                                'default'      => __( 'Default' ),
+                                'remove'       => __( 'Remove' ),
+                                'placeholder'  => __( 'No file selected' ),
+                                'frame_title'  => __( 'Select File' ),
+                                'frame_button' => __( 'Choose File' ),
+                        ) );
+                }
         }
 
@@ -194 +196 @@
                         <div class="actions">
                                 <# if ( data.canUpload ) { #>
-                                <button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>
-                                <button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button"><?php echo $this->button_labels['change']; ?></button>
+                                <button type="button" class="button remove-button">{{ data.button_labels.remove }}</button>
+                                <button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button">{{ data.button_labels.change }}</button>
                                 <div style="clear:both"></div>
                                 <# } #>
@@ -205 +207 @@
                                                 <div class="inner">
                                                         <span>
-                                                                <?php echo $this->button_labels['placeholder']; ?>
+                                                                {{ data.button_labels.placeholder }}
                                                         </span>
                                                 </div>
@@ -213 +215 @@
                         <div class="actions">
                                 <# if ( data.defaultAttachment ) { #>
-                                        <button type="button" class="button default-button"><?php echo $this->button_labels['default']; ?></button>
+                                        <button type="button" class="button default-button">{{ data.button_labels.default }}</button>
                                 <# } #>
                                 <# if ( data.canUpload ) { #>
-                                <button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button"><?php echo $this->button_labels['select']; ?></button>
+                                <button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button">{{ data.button_labels.select }}</button>
                                 <# } #>
                                 <div style="clear:both"></div>