Ticket #6544: 6544.ray.02.patch

src/bp-blogs/bp-blogs-filters.php

@@ -121 +121 @@
 }
 add_filter( 'bp_activity_post_pre_publish', 'bp_blogs_post_pre_publish', 10, 4 );
 add_filter( 'bp_activity_post_pre_comment', 'bp_blogs_post_pre_publish', 10, 4 );
+
+/**
+ * Registers our custom thumb size with WP's Site Icon feature.
+ *
+ * @since 2.7.0
+ *
+ * @param  array $sizes Current array of custom site icon sizes.
+ * @return array
+ */
+function bp_blogs_register_custom_site_icon_size( $sizes ) {
+        $sizes[] = bp_core_avatar_thumb_width();
+        return $sizes;
+}
+add_filter( 'site_icon_image_sizes', 'bp_blogs_register_custom_site_icon_size' );

src/bp-blogs/bp-blogs-functions.php

@@ -476 +476 @@
 add_action( 'update_option_thread_comments_depth', 'bp_blogs_update_option_thread_comments_depth', 10, 2 );
 
 /**
+ * Syncs site icon URLs to blogmeta.
+ *
+ * @since 2.7.0
+ *
+ * @param int|string $old_value Old value
+ * @param int|string $new_value New value
+ */
+function bp_blogs_update_option_site_icon( $old_value, $new_value ) {
+        if ( 0 === $new_value ) {
+                bp_blogs_update_blogmeta( get_current_blog_id(), 'site_icon_url_thumb', 0 );
+                bp_blogs_update_blogmeta( get_current_blog_id(), 'site_icon_url_full',  0 );
+        } else {
+                // Save site icon URL as blogmeta.
+                bp_blogs_update_blogmeta( get_current_blog_id(), 'site_icon_url_thumb', get_site_icon_url( bp_core_avatar_thumb_width() ) );
+                bp_blogs_update_blogmeta( get_current_blog_id(), 'site_icon_url_full',  get_site_icon_url( bp_core_avatar_full_width()  ) );
+        }
+}
+add_action( 'update_option_site_icon', 'bp_blogs_update_option_site_icon', 10, 2 );
+
+/**
  * Deletes the 'url' blogmeta for a site.
  *
  * Hooked to 'refresh_blog_details', which is notably used when editing a site

src/bp-blogs/bp-blogs-template.php

@@ -345 +345 @@
                         'no_grav' => true,
                 ) );
 
-                // Fetch the avatar.
-                $avatar = bp_core_fetch_avatar( array(
-                        'item_id'    => $blogs_template->blog->admin_user_id,
-                        'title'      => $r['title'],
-                        // 'avatar_dir' => 'blog-avatars',
-                        // 'object'     => 'blog',
-                        'type'       => $r['type'],
-                        'alt'        => $r['alt'],
-                        'css_id'     => $r['id'],
-                        'class'      => $r['class'],
-                        'width'      => $r['width'],
-                        'height'     => $r['height']
-                ) );
+                // Use site icon if available.
+                $avatar = '';
+                if ( bp_is_active( 'blogs', 'site-icon' ) && function_exists( 'has_site_icon' ) ) {
+                        $site_icon = bp_blogs_get_blogmeta( bp_get_blog_id(), "site_icon_url_{$r['type']}" );
+
+                        // Never attempted to fetch site icon before; do it now!
+                        if ( '' === $site_icon ) {
+                                switch_to_blog( bp_get_blog_id() );
+
+                                // Fetch the other size first.
+                                if ( 'full' === $r['type'] ) {
+                                        $size      = bp_core_avatar_thumb_width();
+                                        $save_size = 'thumb';
+                                } else {
+                                        $size      = bp_core_avatar_full_width();
+                                        $save_size = 'full';
+                                }
+
+                                $site_icon = get_site_icon_url( $size );
+                                // Empty site icons get saved as integer 0.
+                                if ( empty( $site_icon ) ) {
+                                        $site_icon = 0;
+                                }
+
+                                // Sync site icon for other size to blogmeta.
+                                bp_blogs_update_blogmeta( bp_get_blog_id(), "site_icon_url_{$save_size}", $site_icon );
+
+                                // Now, fetch the size we want.
+                                if ( 0 !== $site_icon ) {
+                                        $size      = 'full' === $r['type'] ? bp_core_avatar_full_width() : bp_core_avatar_thumb_width();
+                                        $site_icon = get_site_icon_url( $size );
+                                }
+
+                                // Sync site icon to blogmeta.
+                                bp_blogs_update_blogmeta( bp_get_blog_id(), "site_icon_url_{$r['type']}", $site_icon );
+
+                                restore_current_blog();
+                        }
+
+                        // We have a site icon.
+                        if ( ! is_numeric( $site_icon ) ) {
+                                if ( empty( $r['width'] ) && ! isset( $size ) ) {
+                                        $size = 'full' === $r['type'] ? bp_core_avatar_full_width() : bp_core_avatar_thumb_width();
+                                } else {
+                                        $size = (int) $r['width'];
+                                }
+
+                                $avatar = sprintf( '<img src="%1$s" class="%2$s" width="%3$s" height="%3$s" alt="%4$s" title="%4$s" />',
+                                        esc_url( $site_icon ),
+                                        esc_attr( "{$r['class']} avatar-{$size}" ),
+                                        esc_attr( $size ),
+                                        sprintf( esc_attr__( 'Site icon for %s', 'buddypress' ), bp_get_blog_name() )
+                                );
+                        }
+                }
+
+                // Fallback to user ID avatar.
+                if ( '' === $avatar ) {
+                        $avatar = bp_core_fetch_avatar( array(
+                                'item_id'    => $blogs_template->blog->admin_user_id,
+                                'title'      => $r['title'],
+                                // 'avatar_dir' => 'blog-avatars',
+                                // 'object'     => 'blog',
+                                'type'       => $r['type'],
+                                'alt'        => $r['alt'],
+                                'css_id'     => $r['id'],
+                                'class'      => $r['class'],
+                                'width'      => $r['width'],
+                                'height'     => $r['height']
+                        ) );
+                }
 
                 /**
                  * In future BuddyPress versions you will be able to set the avatar for a blog.

src/bp-blogs/classes/class-bp-blogs-component.php

@@ -32 +32 @@
                         array(
                                 'adminbar_myaccount_order' => 30,
                                 'search_query_arg' => 'sites_search',
+                                'features' => array( 'site-icon' )
                         )
                 );
         }