pub themes: Restore changes overwritten from latest themes deploy (D1…

…44213 D144218 D144223 D144228 D144234 D144240 D144244) (#7708)
Automattic · Apr 3, 2024 · 836413e · 836413e
1 parent 1196e44
commit 836413e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/altofocus/inc/jetpack.php b/altofocus/inc/jetpack.php
@@ -116,7 +116,7 @@ function altofocus_get_featured_post_ids() {
 	if ( false === $featured_ids ) {
 
 		$featured_options = get_option( 'featured-content', FALSE );
-		$featured_tag_name = $featured_options[ 'tag-name' ];
+		$featured_tag_name = $featured_options[ 'tag-name' ] ?? null;
 		$term = get_term_by( 'name', $featured_tag_name, 'post_tag' );
 
 		if ( $term ) {

diff --git a/dyad-2/inc/extras.php b/dyad-2/inc/extras.php
@@ -33,7 +33,11 @@ function dyad_2_body_classes( $classes ) {
 	}
 
 	//Has featured image?
-	if ( ! is_page() && dyad_2_has_post_thumbnail( $post->ID ) && dyad_2_jetpack_featured_image_display() ) {
+	if (
+		! is_page()
+		&& dyad_2_has_post_thumbnail( $post->ID ?? null )
+		&& dyad_2_jetpack_featured_image_display()
+	) {
 		$classes[] = 'has-post-thumbnail';
 	}
 

diff --git a/lodestar/components/page/content-front-page-panels.php b/lodestar/components/page/content-front-page-panels.php
@@ -25,7 +25,10 @@
 
 		$thumbnail_attributes = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'lodestar-featured-image' );
 		//Calculate aspect ratio: h / w * 100%
+		$ratio = 100;
+		if ( isset($thumbnail_attributes[2] ) && isset( $thumbnail_attributes[1] ) && $thumbnail_attributes[1] > 0 ) {
 		$ratio = $thumbnail_attributes[2] / $thumbnail_attributes[1] * 100;
+		}
 		?>
 
 		<div class="panel-image" style="background-image: url(<?php echo esc_url( $thumbnail[0] ); ?>);">

diff --git a/radcliffe-2/inc/logo-resizer.php b/radcliffe-2/inc/logo-resizer.php
@@ -95,6 +95,9 @@ function logo_awesomeness_customize_logo_resize( $html ) {
 
 /* Helper function to determine the max size of the logo */
 function logo_awesomeness_min_max( $short, $long, $short_max, $long_max, $percent, $min ){
+	$short ??= 1;
+	$long ??= 1;
+
 	$max = [];
 	$size = [];
 	$ratio = ( $long / $short );

diff --git a/seedlet/inc/wpcom.php b/seedlet/inc/wpcom.php
@@ -33,11 +33,11 @@ function seedlet_wpcom_setup() {
 
 	$wpcom_colors_array = get_theme_mod( 'colors_manager' );
 	if ( ! empty( $wpcom_colors_array ) ) {
-		$primary    = $wpcom_colors_array['colors']['link'];
-		$secondary  = $wpcom_colors_array['colors']['fg1'];
-		$foreground = $wpcom_colors_array['colors']['txt'];
-		$tertiary   = $wpcom_colors_array['colors']['fg2'];
-		$background = $wpcom_colors_array['colors']['bg'];
+		$primary    = $wpcom_colors_array['colors']['link'] ?? '';
+		$secondary  = $wpcom_colors_array['colors']['fg1'] ?? '';
+		$foreground = $wpcom_colors_array['colors']['txt'] ?? '';
+		$tertiary   = $wpcom_colors_array['colors']['fg2'] ?? '';
+		$background = $wpcom_colors_array['colors']['bg'] ?? '';
 
 		/**
 		 * De-register original editor color palette in favor of the wpcom implementation

diff --git a/shoreditch/inc/extras.php b/shoreditch/inc/extras.php
@@ -57,7 +57,7 @@ function shoreditch_background_image() {
 	}
 	else {
 		$image = wp_get_attachment_image_src( get_post_thumbnail_id( get_the_ID() ), 'post-thumbnail' );
-		$image = $image[0];
+		$image = $image[0] ?? null;
 	}
 
 	if ( ! $image ) {