wpcomsh: Defensive coding around array key (#39240)

* wpcomsh: Defensive coding around array key * Suggestions from code review
Automattic · Sep 4, 2024 · 60e50f6 · 60e50f6
1 parent d15e314
commit 60e50f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/projects/plugins/wpcomsh/changelog/fix-wpcomsh-ref-invalid-key b/projects/plugins/wpcomsh/changelog/fix-wpcomsh-ref-invalid-key
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Checks an array key before attempting to read it.
diff --git a/projects/plugins/wpcomsh/feature-plugins/full-site-editing.php b/projects/plugins/wpcomsh/feature-plugins/full-site-editing.php
@@ -87,13 +87,13 @@ function wpcom_public_coming_soon_replace_yoast_seo_notice() {
 	 */
 	$should_replace_yoast_notice = $are_search_engines_discouraged || $is_wpcom_public_coming_soon_enabled;
 
-	if ( $should_replace_yoast_notice && ! $wpseo_options['ignore_search_engines_discouraged_notice'] ) {
+	if ( $should_replace_yoast_notice && empty( $wpseo_options['ignore_search_engines_discouraged_notice'] ) ) {
 		// Hide the Yoast SEO notice if it's not hidden and the site is set to Coming Soon mode.
 		$wpseo_options['ignore_search_engines_discouraged_notice'] = true;
 		update_option( 'wpseo', $wpseo_options );
 	}
 
-	if ( ! $should_replace_yoast_notice && $wpseo_options['ignore_search_engines_discouraged_notice'] ) {
+	if ( ! $should_replace_yoast_notice && ! empty( $wpseo_options['ignore_search_engines_discouraged_notice'] ) ) {
 		// Restore the default setting if Coming Soon mode is disabled.
 		$wpseo_options['ignore_search_engines_discouraged_notice'] = false;
 		update_option( 'wpseo', $wpseo_options );
@@ -110,7 +110,7 @@ function wpcom_public_coming_soon_replace_yoast_seo_notice() {
 	// Only show the notice on certain admin pages and Yoast SEO admin pages.
 	if (
 		$should_replace_yoast_notice
-		&& $wpseo_options['ignore_search_engines_discouraged_notice'] == true // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
+		&& ! empty( $wpseo_options['ignore_search_engines_discouraged_notice'] )
 		&& ( $on_wpseo_admin_page || in_array( $pagenow, $notice_pages, true ) )
 	) {
 		// Get site slug & settings url.