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

Timestamp:

07/11/2017 10:46:45 PM (9 years ago)

Author:

westonruter

Message:

Widgets: Enqueue assets needed by media and text widgets in their _register_one() methods.

The WP_Widget::_register_one() method is more guaranteed to be called as opposed to its wrapper WP_Widget::_register() which plugins may bypass for performance reasons.

Amends [40631], [40640].
See #35243, #32417.
Fixes #41021.

File:

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

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

@@ -33 +33 @@
         'add_media' => '',
     );
+
+    /**
+     * Whether or not the widget has been registered yet.
+     *
+     * @since 4.8.1
+     * @var bool
+     */
+    protected $registered = false;
 
     /**
@@ -87 +95 @@
      * @since 4.8.0
      * @access public
-     */
-    public function _register() {
+     *
+     * @param integer $number Optional. The unique order number of this widget instance
+     *                        compared to other instances of the same class. Default -1.
+     */
+    public function _register_one( $number = -1 ) {
+        parent::_register_one( $number );
+        if ( $this->registered ) {
+            return;
+        }
+        $this->registered = true;
 
         // Note that the widgets component in the customizer will also do the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().
@@ -101 +117 @@
 
         add_filter( 'display_media_states', array( $this, 'display_media_state' ), 10, 2 );
-
-        parent::_register();
     }