Changeset 45100 for trunk/src/wp-includes/widgets/class-wp-widget-media-video.php

Timestamp:

04/02/2019 10:12:11 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Widgets: Make sure changes to media widgets' instance schema via widget_{$this->id_base}_instance_schema filter are not overridden by subclasses.

Previously, WP_Widget_Media_Audio, WP_Widget_Media_Image, and WP_Widget_Media_Video used to override the changes due to reversed arguments in array_merge() call.

Props Toro_Unit, birgire.
Fixes #45029.

File:

• trunk/src/wp-includes/widgets/class-wp-widget-media-video.php (modified) (5 diffs)

trunk/src/wp-includes/widgets/class-wp-widget-media-video.php

@@ -20 +20 @@
      * Constructor.
      *
-     * @since  4.8.0
+     * @since 4.8.0
      */
     public function __construct() {
@@ -56 +56 @@
      * Get schema for properties of a widget instance (item).
      *
-     * @since  4.8.0
+     * @since 4.8.0
      *
      * @see WP_REST_Controller::get_item_schema()
@@ -64 +64 @@
      */
     public function get_instance_schema() {
-        $schema = array_merge(
-            parent::get_instance_schema(),
-            array(
-                'preload' => array(
-                    'type'                  => 'string',
-                    'enum'                  => array( 'none', 'auto', 'metadata' ),
-                    'default'               => 'metadata',
-                    'description'           => __( 'Preload' ),
-                    'should_preview_update' => false,
-                ),
-                'loop'    => array(
-                    'type'                  => 'boolean',
-                    'default'               => false,
-                    'description'           => __( 'Loop' ),
-                    'should_preview_update' => false,
-                ),
-                'content' => array(
-                    'type'                  => 'string',
-                    'default'               => '',
-                    'sanitize_callback'     => 'wp_kses_post',
-                    'description'           => __( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ),
-                    'should_preview_update' => false,
-                ),
-            )
+
+        $schema = array(
+            'preload' => array(
+                'type'                  => 'string',
+                'enum'                  => array( 'none', 'auto', 'metadata' ),
+                'default'               => 'metadata',
+                'description'           => __( 'Preload' ),
+                'should_preview_update' => false,
+            ),
+            'loop'    => array(
+                'type'                  => 'boolean',
+                'default'               => false,
+                'description'           => __( 'Loop' ),
+                'should_preview_update' => false,
+            ),
+            'content' => array(
+                'type'                  => 'string',
+                'default'               => '',
+                'sanitize_callback'     => 'wp_kses_post',
+                'description'           => __( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ),
+                'should_preview_update' => false,
+            ),
         );
 
@@ -100 +98 @@
         }
 
-        return $schema;
+        return array_merge( $schema, parent::get_instance_schema() );
     }
 
@@ -106 +104 @@
      * Render the media on the frontend.
      *
-     * @since  4.8.0
+     * @since 4.8.0
      *
      * @param array $instance Widget instance props.