Ticket #8384: 8384.patch

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

@@ -549 +549 @@
  * @param int|string $new_value New value
  */
 function bp_blogs_update_option_site_icon( $old_value, $new_value ) {
+        $blog_id = get_current_blog_id();
+
         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 );
+                bp_blogs_update_blogmeta( $blog_id, 'site_icon_url_thumb', 0 );
+                bp_blogs_update_blogmeta( $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()  ) );
+                bp_blogs_update_blogmeta( $blog_id, 'site_icon_url_thumb', bp_blogs_get_site_icon_url( $blog_id, bp_core_avatar_thumb_width() ) );
+                bp_blogs_update_blogmeta( $blog_id, 'site_icon_url_full',  bp_blogs_get_site_icon_url( $blog_id, bp_core_avatar_full_width()  ) );
         }
 }
 add_action( 'update_option_site_icon', 'bp_blogs_update_option_site_icon', 10, 2 );
@@ -1563 +1565 @@
 
         return wpmu_validate_blog_signup( $blog_name, $blog_title, $user );
 }
+
+/**
+ * Gets the site icon URL even when BuddyPress is not activated on the main network site.
+ *
+ * @since 7.0.0
+ *
+ * @param integer $blog_id The ID of the blog to get the site icon URL for.
+ * @param integer $size    The size of the site icon.
+ * @return string          The site icon URL
+ */
+function bp_blogs_get_site_icon_url( $blog_id = 0, $size = 512 ) {
+        if ( is_multisite() && ! bp_is_network_activated() && ! bp_is_root_blog( $blog_id ) ) {
+                $switched_blog = false;
+                $url           = '';
+
+                if ( $blog_id && get_current_blog_id() !== (int) $blog_id ) {
+                        switch_to_blog( $blog_id );
+                        $switched_blog = true;
+                }
+
+                $site_icon_id = get_option( 'site_icon' );
+
+                if ( $site_icon_id ) {
+                        $site_icon_data = wp_get_attachment_metadata( $site_icon_id );
+                        $sizes          = wp_list_pluck( $site_icon_data['sizes'], 'width' );
+
+                        sort( $sizes );
+                        $closest = 'full';
+
+                        foreach ( $sizes as $width ) {
+                                $closest = array( $width, $width );
+
+                                if ( (int) $size < (int) $width ) {
+                                        break;
+                                }
+                        }
+
+                        $url = wp_get_attachment_image_url( $site_icon_id, $closest );
+                }
+
+                if ( $switched_blog ) {
+                        restore_current_blog();
+                }
+
+                return $url;
+        }
+
+        return get_site_icon_url( $size, '', $blog_id );
+}

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

@@ -380 +380 @@
 
                         // Never attempted to fetch site icon before; do it now!
                         if ( '' === $site_icon ) {
-                                switch_to_blog( $blog_id );
-
                                 // Fetch the other size first.
                                 if ( 'full' === $r['type'] ) {
                                         $size      = bp_core_avatar_thumb_width();
@@ -391 +389 @@
                                         $save_size = 'full';
                                 }
 
-                                $site_icon = get_site_icon_url( $size );
+                                $site_icon = bp_blogs_get_site_icon_url( $blog_id, $size );
+
                                 // Empty site icons get saved as integer 0.
                                 if ( empty( $site_icon ) ) {
                                         $site_icon = 0;
@@ -403 +402 @@
                                 // 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 );
+                                        $site_icon = bp_blogs_get_site_icon_url( $blog_id, $size );
                                 }
 
                                 // Sync site icon to blogmeta.
                                 bp_blogs_update_blogmeta( $blog_id, "site_icon_url_{$r['type']}", $site_icon );
-
-                                restore_current_blog();
                         }
 
                         // We have a site icon.

src/bp-core/admin/bp-core-admin-tools.php

@@ -143 +143 @@
                         __( 'Repopulate site tracking records.', 'buddypress' ),
                         'bp_admin_repair_blog_records',
                 );
+
+                if ( bp_is_active( 'blogs', 'site-icon' ) ) {
+                        $repair_list[91] = array(
+                                'bp-blog-site-icons',
+                                __( 'Repair site tracking site icons/blog avatars synchronization.', 'buddypress' ),
+                                'bp_admin_repair_blog_site_icons',
+                        );
+                }
         }
 
         // Emails:
@@ -312 +320 @@
         return array( 0, sprintf( $statement, $result ) );
 }
 
+/**
+ * Repair site icons/blog avatars synchronization.
+ *
+ * @since 7.0.0
+ *
+ * @return array
+ */
+function bp_admin_repair_blog_site_icons() {
+
+        /* translators: %s: the result of the action performed by the repair tool */
+        $statement = __( 'Repairing site icons/blog avatars synchronization… %s', 'buddypress' );
+
+        // Run function if blogs component is active.
+        if ( bp_is_active( 'blogs', 'site-icon' ) ) {
+                $blog_ids = get_sites(
+                        array(
+                                'fields'   => 'ids',
+                                'archived' => 0,
+                                'mature'   => 0,
+                                'spam'     => 0,
+                                'deleted'  => 0,
+                        )
+                );
+
+                $sizes = array(
+                        array(
+                                'key'  => 'site_icon_url_full',
+                                'size' => bp_core_avatar_full_width(),
+                        ),
+                        array(
+                                'key'  => 'site_icon_url_thumb',
+                                'size' => bp_core_avatar_thumb_width(),
+                        ),
+                );
+
+                foreach ( $blog_ids as $blog_id ) {
+                        $site_icon = 0;
+
+                        foreach ( $sizes as $size ) {
+                                $site_icon = bp_blogs_get_site_icon_url( $blog_id, $size['size'] );
+                                if ( ! $site_icon ) {
+                                        $site_icon = 0;
+                                }
+
+                                bp_blogs_update_blogmeta( $blog_id, $size['key'], $site_icon );
+                        }
+                }
+        }
+
+        // All done!
+        return array( 0, sprintf( $statement, __( 'Complete!', 'buddypress' ) ) );
+}
+
 /**
  * Recalculate the total number of active site members.
  *

src/bp-templates/bp-nouveau/common-styles/_bp_blogs_loop.scss

@@ -7 +7 @@
 
                 li {
 
+                        .item-avatar {
+
+                                img.avatar-150 {
+                                        max-width: 150px;
+                                        max-height: 150px;
+                                }
+
+                                img.avatar-50 {
+                                        max-width: 50px;
+                                        max-height: 50px;
+                                }
+                        }
+
                         @include medium-up() {
 
                                 .item-block {

src/bp-templates/bp-nouveau/css/buddypress-rtl.css

@@ -1774 +1774 @@
 * @section 3.2 - Blogs Loop
 *----------------------------------------------------------
 */
+.buddypress-wrap .blogs-list li .item-avatar img.avatar-150 {
+        max-width: 150px;
+        max-height: 150px;
+}
+
+.buddypress-wrap .blogs-list li .item-avatar img.avatar-50 {
+        max-width: 50px;
+        max-height: 50px;
+}
+
 @media screen and (min-width: 46.8em) {
         .buddypress-wrap .blogs-list li .item-block {
                 float: none;

src/bp-templates/bp-nouveau/css/buddypress.css

@@ -1774 +1774 @@
 * @section 3.2 - Blogs Loop
 *----------------------------------------------------------
 */
+.buddypress-wrap .blogs-list li .item-avatar img.avatar-150 {
+        max-width: 150px;
+        max-height: 150px;
+}
+
+.buddypress-wrap .blogs-list li .item-avatar img.avatar-50 {
+        max-width: 50px;
+        max-height: 50px;
+}
+
 @media screen and (min-width: 46.8em) {
         .buddypress-wrap .blogs-list li .item-block {
                 float: none;

tests/phpunit/testcases/blogs/template.php

@@ -431 +431 @@
                 ) );
 
                 add_filter( 'get_site_icon_url', array( $this, 'filter_blog_avatar' ) );
+                add_filter( 'bp_is_network_activated', '__return_true' );
 
                 $avatar = bp_get_blog_avatar( array(
                         'type'          => 'full',
@@ -441 +442 @@
                         'class'         => 'avatar',
                 ) );
 
+                remove_filter( 'bp_is_network_activated', '__return_true' );
                 remove_filter( 'get_site_icon_url', array( $this, 'filter_blog_avatar' ) );
                 $blogs_template = $reset_blogs_template;