Changeset 51199 for trunk/src/wp-includes/blocks/legacy-widget.php

Timestamp:

06/22/2021 09:58:32 AM (4 years ago)

Author:

jorgefilipecosta

Message:

Block Editor: Package updates for Beta 3.

The commit updates the WordPress packages for beta 3.

Props nosolosw, noisysocks, youknowriad.
See #53397.

File:

• trunk/src/wp-includes/blocks/legacy-widget.php (modified) (4 diffs)

trunk/src/wp-includes/blocks/legacy-widget.php

@@ -25 +25 @@
     }
 
-    if ( method_exists( $wp_widget_factory, 'get_widget_object' ) ) {
-        $widget_object = $wp_widget_factory->get_widget_object( $attributes['idBase'] );
+    $id_base = $attributes['idBase'];
+    if ( method_exists( $wp_widget_factory, 'get_widget_key' ) ) {
+        $widget_key = $wp_widget_factory->get_widget_key( $id_base );
     } else {
-        $widget_object = gutenberg_get_widget_object( $attributes['idBase'] );
+        $widget_key = gutenberg_get_widget_key( $id_base );
     }
 
-    if ( ! $widget_object ) {
+    if ( ! $widget_key ) {
         return '';
     }
@@ -46 +47 @@
 
     ob_start();
-    the_widget( get_class( $widget_object ), $instance );
+    the_widget( $widget_key, $instance );
     return ob_get_clean();
 }
@@ -91 +92 @@
             /* Reset theme styles */
             html, body, #page, #content {
-                background: #FFF !important;
                 padding: 0 !important;
                 margin: 0 !important;
@@ -115 +115 @@
 }
 
-// Ensure handle_legacy_widget_preview_iframe() is called after Core's
-// register_block_core_legacy_widget() (priority = 10) and after Gutenberg's
-// register_block_core_legacy_widget() (priority = 20).
-add_action( 'init', 'handle_legacy_widget_preview_iframe', 21 );
+// Use admin_init instead of init to ensure get_current_screen function is already available.
+// This isn't strictly required, but enables better compatibility with existing plugins.
+// See: https://github.com/WordPress/gutenberg/issues/32624.
+add_action( 'admin_init', 'handle_legacy_widget_preview_iframe', 20 );