Avoid PHP notices when widget is first added

Automattic · Oct 18, 2024 · 76c0fa3 · 76c0fa3
1 parent fac6440
commit 76c0fa3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/projects/packages/search/src/widgets/class-search-widget.php b/projects/packages/search/src/widgets/class-search-widget.php
@@ -637,8 +637,8 @@ public function update( $new_instance, $old_instance ) { // phpcs:ignore Variabl
 		// Keep `search_box_enabled` and `user_sort_enabled` settings when updating widget on Instant Search
 		// Set `search_box_enabled` and `user_sort_enabled` default to '1' when createing a NEW widget
 		if ( Options::is_instant_enabled() ) {
-			$instance['search_box_enabled'] = empty( $old_instance ) ? '1' : $old_instance['search_box_enabled'];
-			$instance['user_sort_enabled']  = empty( $old_instance ) ? '1' : $old_instance['user_sort_enabled'];
+			$instance['search_box_enabled'] = empty( $old_instance ) || empty( $old_instance['search_box_enabled'] ) ? '1' : $old_instance['search_box_enabled'];
+			$instance['user_sort_enabled']  = empty( $old_instance ) || empty( $old_instance['user_sort_enabled'] ) ? '1' : $old_instance['user_sort_enabled'];
 		} else {
 			$instance['search_box_enabled'] = empty( $new_instance['search_box_enabled'] ) ? '0' : '1';
 			$instance['user_sort_enabled']  = empty( $new_instance['user_sort_enabled'] ) ? '0' : '1';