From d38bf60d11ab299b3d4da9375287a5c77acc69c3 Mon Sep 17 00:00:00 2001 From: Matt Wiebe Date: Wed, 16 Aug 2023 21:39:55 -0500 Subject: [PATCH] add site logo support to blog user (#400) --- includes/model/class-blog-user.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/includes/model/class-blog-user.php b/includes/model/class-blog-user.php index 3a1ae07..8de46df 100644 --- a/includes/model/class-blog-user.php +++ b/includes/model/class-blog-user.php @@ -125,16 +125,21 @@ class Blog_User extends User { * @return array|null The User-Icon. */ public function get_icon() { - $image = wp_get_attachment_image_src( get_theme_mod( 'custom_logo' ) ); - - if ( $image ) { - return array( - 'type' => 'Image', - 'url' => esc_url( $image[0] ), - ); + // try site icon first + $icon_id = get_option( 'site_icon' ); + // try custom logo second + if ( ! $icon_id ) { + $icon_id = get_theme_mod( 'custom_logo' ); + } + if ( ! $icon_id ) { + return null; } - return null; + $image = wp_get_attachment_image_src( $icon_id, 'full' ); + return array( + 'type' => 'Image', + 'url' => esc_url( $image[0] ), + ); } /**