From 98c07b77dc4d5fc08d27d5cdf23a5113f65dab44 Mon Sep 17 00:00:00 2001
From: kurudrive <kurudrive@gmail.com>
Date: Fri, 6 Dec 2024 21:58:38 +0900
Subject: [PATCH 1/2] [ G3 ][ Bug fix ] Fix profile image warning

---
 _g3/inc/template-tags.php | 20 ++++++++++++--------
 readme.txt                |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/_g3/inc/template-tags.php b/_g3/inc/template-tags.php
index 767eb73b..0afed61c 100644
--- a/_g3/inc/template-tags.php
+++ b/_g3/inc/template-tags.php
@@ -355,18 +355,22 @@ function lightning_get_entry_meta( $options = array() ) {
 				<span class="vcard author" itemprop="author">';
 
 				if ( $option['author_image'] ) {
-					$html .= '<span class="entry-meta-item-author-image">';
-
 					// VK Post Author Display の画像を取得.
-					$profile_image_id = get_the_author_meta( 'user_profile_image' );
-					if ( $profile_image_id ) {
-						$profile_image_src = wp_get_attachment_image_src( $profile_image_id, 'thumbnail' );
-						$html             .= '<img src="' . $profile_image_src[0] . '" alt="' . esc_attr( $author ) . '" />';
+					$profile_image_id                 = get_the_author_meta( 'user_profile_image' );
+					$vk_post_author_display_image_src = wp_get_attachment_image_src( $profile_image_id, 'thumbnail' );
+					// 画像がメディアライブラリ側で削除されたりもするため、 is_array で判定.
+					if ( is_array( $vk_post_author_display_image_src ) ) {
+						$profile_image = '<img src="' . $vk_post_author_display_image_src[0] . '" alt="' . esc_attr( $author ) . '" />';
 					} else {
-						$html .= get_avatar( get_the_author_meta( 'email' ), 30 );
+						// プロフィール画像がない場合は Gravatar.
+						$profile_image = get_avatar( get_the_author_meta( 'email' ), 30 );
 					}
 
-					$html .= '</span>';
+					if ( $profile_image ) {
+						$html .= '<span class="entry-meta-item-author-image">';
+						$html .= $profile_image;
+						$html .= '</span>';
+					}
 				}
 
 				if ( $option['author_name'] ) {
diff --git a/readme.txt b/readme.txt
index 8c2dbf98..225b79e1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -37,6 +37,7 @@ https://www.vektor-inc.co.jp/inquiry/
 
 == Changelog ==
 
+[ G3 ][ Bug fix ] Fix profile image warning
 [ G2 ][ Specification Change ] Change load module priority
 
 v15.28.2

From 3e428a5fac90b1ca1dc703ff2293c33d17592a84 Mon Sep 17 00:00:00 2001
From: kurudrive <kurudrive@gmail.com>
Date: Sat, 7 Dec 2024 11:40:22 +0900
Subject: [PATCH 2/2] =?UTF-8?q?user=20profile=20=E7=94=BB=E5=83=8F?=
 =?UTF-8?q?=E6=9C=AA=E7=99=BB=E9=8C=B2=E6=99=82=E3=81=AE=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _g3/inc/template-tags.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/_g3/inc/template-tags.php b/_g3/inc/template-tags.php
index 0afed61c..26998289 100644
--- a/_g3/inc/template-tags.php
+++ b/_g3/inc/template-tags.php
@@ -356,10 +356,12 @@ function lightning_get_entry_meta( $options = array() ) {
 
 				if ( $option['author_image'] ) {
 					// VK Post Author Display の画像を取得.
-					$profile_image_id                 = get_the_author_meta( 'user_profile_image' );
-					$vk_post_author_display_image_src = wp_get_attachment_image_src( $profile_image_id, 'thumbnail' );
+					$profile_image_id = get_the_author_meta( 'user_profile_image' );
+					if ( $profile_image_id ) {
+						$vk_post_author_display_image_src = wp_get_attachment_image_src( $profile_image_id, 'thumbnail' );
+					}
 					// 画像がメディアライブラリ側で削除されたりもするため、 is_array で判定.
-					if ( is_array( $vk_post_author_display_image_src ) ) {
+					if ( isset( $vk_post_author_display_image_src ) && is_array( $vk_post_author_display_image_src ) ) {
 						$profile_image = '<img src="' . $vk_post_author_display_image_src[0] . '" alt="' . esc_attr( $author ) . '" />';
 					} else {
 						// プロフィール画像がない場合は Gravatar.