cpt-nova: Check the return value of get_menu_item_menu_leaf() (#35182)

* cpt-nova: Check the return value of `get_menu_item_menu_leaf()` * Update changelog entry * Additional checks on the value of menu_item_loop_current_term --------- Co-authored-by: Jeremy Herve <[email protected]>
Automattic · Jan 30, 2024 · 7951333 · 7951333
1 parent fa5ee3f
commit 7951333
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/projects/plugins/jetpack/changelog/fix-cpt-nova b/projects/plugins/jetpack/changelog/fix-cpt-nova
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Nova Custom Content Type: avoid PHP notice.
+
+
diff --git a/projects/plugins/jetpack/modules/custom-post-types/nova.php b/projects/plugins/jetpack/modules/custom-post-types/nova.php
@@ -1587,6 +1587,14 @@ public function start_menu_item_loop( $query ) {
 	public function menu_item_loop_each_post( $post ) {
 		$this->menu_item_loop_current_term = $this->get_menu_item_menu_leaf( $post->ID );
 
+		if (
+			false === $this->menu_item_loop_current_term
+			|| null === $this->menu_item_loop_current_term
+			|| is_wp_error( $this->menu_item_loop_current_term )
+		) {
+			return;
+		}
+
 		if ( false === $this->menu_item_loop_last_term_id ) {
 			// We're at the very beginning of the loop