Refactor to continue if values are not arrays

WordPress · Nov 8, 2023 · e50f0a5 · e50f0a5
1 parent ffabdfa
commit e50f0a5
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/lib/experimental/fonts-api/class-wp-fonts-resolver.php b/lib/experimental/fonts-api/class-wp-fonts-resolver.php
@@ -202,14 +202,17 @@ private static function get_settings() {
 				$settings            = static::set_tyopgraphy_settings_array_structure( $settings );
 			}
 
-			// Merge the variation settings with the global settings.
-			if ( is_array( $settings['typography']['fontFamilies']['theme'] ) && is_array( $variation['settings']['typography']['fontFamilies']['theme'] ) ) {
-				$settings['typography']['fontFamilies']['theme'] = array_merge(
-					$settings['typography']['fontFamilies']['theme'],
-					$variation['settings']['typography']['fontFamilies']['theme']
-				);
+			// Skip if typography.fontFamilies.theme from the global settings and the variation are not arrays.
+			if ( ! is_array( $settings['typography']['fontFamilies']['theme'] ) && ! is_array( $variation['settings']['typography']['fontFamilies']['theme'] ) ) {
+				continue;
 			}
 
+			// Merge the variation settings with the global settings.
+			$settings['typography']['fontFamilies']['theme'] = array_merge(
+				$settings['typography']['fontFamilies']['theme'],
+				$variation['settings']['typography']['fontFamilies']['theme']
+			);
+
 			// Make sure there are no duplicates.
 			$settings['typography']['fontFamilies'] = array_unique( $settings['typography']['fontFamilies'] );
 		}