Changeset 12779 for trunk/src/bp-blogs/bp-blogs-template.php

Timestamp:

11/11/2020 01:33:08 PM (3 years ago)

Author:

imath

Message:

BP Blogs: improve Site Icons / Blavatar synchronization

Make sure BuddyPress tries to synchronize Sites Icons / Blavatars even when it's not network activated.

Add a new BP Repair tool to repair this synchronization. This can be needed when a different site of the network has its site icon updated after the BuddyPress Sites directory already listed this site previously.

Props vapvarun

Fixes #8384

File:

• trunk/src/bp-blogs/bp-blogs-template.php (modified) (3 diffs)

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

@@ -381 +381 @@
             // 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'] ) {
@@ -392 +390 @@
                 }
 
-                $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 ) ) {
@@ -404 +403 @@
                 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();
             }