Fix trim notices with esc functions when passing null

pods-framework · Mar 26, 2024 · 0a58b52 · 0a58b52
1 parent d67c1d2
commit 0a58b52
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/classes/fields/pick.php b/classes/fields/pick.php
@@ -1703,11 +1703,11 @@ public function build_dfv_field_item_data_recurse_item( $item_id, $item_title, $
 		}
 
 		$item = array(
-			'id'        => html_entity_decode( esc_html( $item_id ) ),
-			'icon'      => esc_attr( $icon ),
-			'name'      => wp_strip_all_tags( html_entity_decode( $item_title ) ),
-			'edit_link' => html_entity_decode( esc_url( $edit_link ) ),
-			'link'      => html_entity_decode( esc_url( $link ) ),
+			'id'        => null !== $item_id ? html_entity_decode( esc_html( $item_id ) ) : '',
+			'icon'      => null !== $icon ? esc_attr( $icon ) : '',
+			'name'      => null !== $item_title ? wp_strip_all_tags( html_entity_decode( $item_title ) ) : '',
+			'edit_link' => null !== $edit_link ? html_entity_decode( esc_url( $edit_link ) ) : '',
+			'link'      => null !== $link ? html_entity_decode( esc_url( $link ) ) : '',
 			'selected'  => $selected,
 		);