Changeset 56076 for trunk/src/wp-includes/blocks/navigation.php

Timestamp:

06/27/2023 06:25:20 PM (3 years ago)

Author:

Bernhard Reiter

Message:

Editor: Update npm WordPress npm packages.

This fixes a fatal error in the Navigation block, which was due to a reference
to WP_Navigation_Fallback_Gutenberg that isn’t present in Core under that name.

Follow-up to [56065].
Props ramonjd, isabel_brison, dmsnell.
Fixes #58623.

File:

• trunk/src/wp-includes/blocks/navigation.php (modified) (12 diffs)

trunk/src/wp-includes/blocks/navigation.php

@@ -95 +95 @@
      * @return string Submenu markup with the directives injected.
      */
-    function gutenberg_block_core_navigation_add_directives_to_submenu( $w, $block_attributes ) {
+    function block_core_navigation_add_directives_to_submenu( $w, $block_attributes ) {
         while ( $w->next_tag(
             array(
@@ -125 +125 @@
 
             // Iterate through subitems if exist.
-            gutenberg_block_core_navigation_add_directives_to_submenu( $w, $block_attributes );
+            block_core_navigation_add_directives_to_submenu( $w, $block_attributes );
         }
         return $w->get_updated_html();
@@ -342 +342 @@
     $fallback_blocks = $registry->is_registered( 'core/page-list' ) ? $page_list_fallback : array();
 
-    $navigation_post = WP_Navigation_Fallback_Gutenberg::get_fallback();
+    if ( class_exists( 'WP_Navigation_Fallback' ) ) {
+        $navigation_post = WP_Navigation_Fallback::get_fallback();
+    } else {
+        $navigation_post = Gutenberg_Navigation_Fallback::get_fallback();
+    }
 
     // Use the first non-empty Navigation as fallback if available.
@@ -674 +678 @@
     if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN && $has_submenus && $should_load_view_script ) {
         $w                 = new WP_HTML_Tag_Processor( $inner_blocks_html );
-        $inner_blocks_html = gutenberg_block_core_navigation_add_directives_to_submenu( $w, $attributes );
+        $inner_blocks_html = block_core_navigation_add_directives_to_submenu( $w, $attributes );
     }
 
@@ -837 +841 @@
  * Turns menu item data into a nested array of parsed blocks
  *
+ * @deprecated 6.3.0 Use WP_Navigation_Fallback::parse_blocks_from_menu_items() instead.
+ *
  * @param array $menu_items               An array of menu items that represent
  *                                        an individual level of a menu.
@@ -847 +853 @@
 function block_core_navigation_parse_blocks_from_menu_items( $menu_items, $menu_items_by_parent_id ) {
 
-    _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback_Gutenberg::parse_blocks_from_menu_items' );
+    _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback::parse_blocks_from_menu_items' );
 
     if ( empty( $menu_items ) ) {
@@ -892 +898 @@
  * Get the classic navigation menu to use as a fallback.
  *
+ * @deprecated 6.3.0 Use WP_Navigation_Fallback::get_classic_menu_fallback() instead.
+ *
  * @return object WP_Term The classic navigation.
  */
 function block_core_navigation_get_classic_menu_fallback() {
 
-    _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback_Gutenberg::get_classic_menu_fallback' );
+    _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback::get_classic_menu_fallback' );
 
     $classic_nav_menus = wp_get_nav_menus();
@@ -934 +942 @@
  * Converts a classic navigation to blocks.
  *
+ * @deprecated 6.3.0 Use WP_Navigation_Fallback::get_classic_menu_fallback_blocks() instead.
+ *
  * @param  object $classic_nav_menu WP_Term The classic navigation object to convert.
  * @return array the normalized parsed blocks.
@@ -939 +949 @@
 function block_core_navigation_get_classic_menu_fallback_blocks( $classic_nav_menu ) {
 
-    _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback_Gutenberg::get_classic_menu_fallback_blocks' );
+    _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback::get_classic_menu_fallback_blocks' );
 
     // BEGIN: Code that already exists in wp_nav_menu().
@@ -972 +982 @@
 
 /**
- * If there's a the classic menu then use it as a fallback.
+ * If there's a classic menu then use it as a fallback.
+ *
+ * @deprecated 6.3.0 Use WP_Navigation_Fallback::create_classic_menu_fallback() instead.
  *
  * @return array the normalized parsed blocks.
@@ -978 +990 @@
 function block_core_navigation_maybe_use_classic_menu_fallback() {
 
-    _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback_Gutenberg::create_classic_menu_fallback' );
+    _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback::create_classic_menu_fallback' );
 
     // See if we have a classic menu.
@@ -1017 +1029 @@
  * Finds the most recently published `wp_navigation` Post.
  *
+ * @deprecated 6.3.0 Use WP_Navigation_Fallback::get_most_recently_published_navigation() instead.
+ *
  * @return WP_Post|null the first non-empty Navigation or null.
  */
 function block_core_navigation_get_most_recently_published_navigation() {
 
-    _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback_Gutenberg::get_most_recently_published_navigation' );
+    _deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback::get_most_recently_published_navigation' );
 
     // Default to the most recently created menu.