Changeset 61465

Timestamp:

01/10/2026 06:36:40 AM (7 months ago)

Author:

westonruter

Message:

Menus: Ensure a WP_Post instance gets passed to get_post_states() in wp_setup_nav_menu_item().

The get_post_states() function is also hardened to short-circuit in case a non-WP_Post is passed. A test is added to verify this.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/10706

Follow-up to [47211].

Props apedog, josephscott, joemcgill, westonruter.
See #49374.
Fixes #58932.

Location:

trunk

Files:

• src/wp-admin/includes/template.php (modified) (1 diff)
• src/wp-includes/nav-menu.php (modified) (1 diff)
• tests/phpunit/tests/admin/includesTemplate.php (modified) (1 diff)

trunk/src/wp-admin/includes/template.php

@@ -2297 +2297 @@
 function get_post_states( $post ) {
         $post_states = array();
+        if ( ! $post instanceof WP_Post ) {
+                return $post_states;
+        }
+
         $post_status = $_REQUEST['post_status'] ?? '';
 

trunk/src/wp-includes/nav-menu.php

@@ -876 +876 @@
                                         // Denote post states for special pages (only in the admin).
                                         if ( function_exists( 'get_post_states' ) ) {
-                                                $menu_post   = get_post( $menu_item->object_id );
-                                                $post_states = get_post_states( $menu_post );
-                                                if ( $post_states ) {
-                                                        $menu_item->type_label = wp_strip_all_tags( implode( ', ', $post_states ) );
+                                                $menu_post = get_post( $menu_item->object_id );
+                                                if ( $menu_post instanceof WP_Post ) {
+                                                        $post_states = get_post_states( $menu_post );
+                                                        if ( $post_states ) {
+                                                                $menu_item->type_label = wp_strip_all_tags( implode( ', ', $post_states ) );
+                                                        }
                                                 }
                                         }

trunk/tests/phpunit/tests/admin/includesTemplate.php

@@ -495 +495 @@
                 remove_meta_box( 'dashboard2', 'dashboard', 'normal' );
         }
+
+        /**
+         * Tests that get_post_states() handles a null value gracefully.
+         *
+         * This can happen when get_post() returns null (e.g., when a post
+         * doesn't exist) and that result is passed to get_post_states()
+         * without being checked first.
+         *
+         * @ticket 58932
+         *
+         * @covers ::get_post_states
+         */
+        public function test_get_post_states_with_null_returns_empty_array() {
+                $result = get_post_states( null );
+                $this->assertSame( array(), $result, 'get_post_states() should return an empty array when WP_Post is not supplied.' );
+        }
 }