Ticket #53481: 53481.patch

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

@@ -24 +24 @@
                 return '';
         }
 
-        $id_base = $attributes['idBase'];
+        $id_base    = $attributes['idBase'];
+        $widget_key = '';
         if ( method_exists( $wp_widget_factory, 'get_widget_key' ) ) {
                 $widget_key = $wp_widget_factory->get_widget_key( $id_base );
-        } else {
-                $widget_key = gutenberg_get_widget_key( $id_base );
         }
 
         if ( ! $widget_key ) {

src/wp-includes/class-wp-widget-factory.php

@@ -120 +120 @@
 
                 return null;
         }
+
+        /**
+         * Returns the registered key for the given widget type.
+         *
+         * @since 5.8.0
+         *
+         * @param string $id_base Widget type ID.
+         * @return string
+         */
+        public function get_widget_key( $id_base ) {
+                foreach ( $this->widgets as $key => $widget_object ) {
+                        if ( $widget_object->id_base === $id_base ) {
+                                return $key;
+                        }
+                }
+
+                return '';
+        }
 }