Changeset 14072

Timestamp:

11/03/2024 06:58:50 PM (5 months ago)

Author:

espellcaste

Message:

Blogs: blog_id is accepted in the bp_get_blog_avatar, regardless if there is a blog in the current loop.

Props imath.

Closes ​https://github.com/buddypress/buddypress/pull/398
Fixes #9228

Location:

trunk

Files:

• src/bp-blogs/bp-blogs-template.php (modified) (4 diffs)
• tests/phpunit/testcases/blogs/template.php (modified) (1 diff)

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

@@ -360 +360 @@
      *     @type bool     $html          Default: true.
      * }
-     * @return string User avatar string.
+     * @return string|bool User avatar string. False if avatars are turned off.
      */
     function bp_get_blog_avatar( $args = '' ) {
@@ -374 +374 @@
         $alt_attribute = __( 'Site icon for the blog', 'buddypress' );
 
-        $has_current_blog = isset( $blogs_template ) && isset( $blogs_template->blog->blog_id );
-
-        if ( false === $has_current_blog && isset( $args['blog_id'] ) && $args['blog_id'] ) {
+        if ( ! empty( $args['blog_id'] ) ) {
             $blog_id = (int) $args['blog_id'];
-        } else if ( true === $has_current_blog ) {
+        } else if ( isset( $blogs_template->blog->blog_id ) ) {
             $blog_id = bp_get_blog_id();
 
@@ -536 +534 @@
         global $blogs_template;
 
+        $name = '';
+
+        if ( ! empty( $blogs_template->blog->name ) ) {
+            $name = $blogs_template->blog->name;
+        }
+
         /**
          * Filters the name of the current blog in the loop.
@@ -543 +547 @@
          * @param string $name Name of the current blog in the loop.
          */
-        return apply_filters( 'bp_get_blog_name', $blogs_template->blog->name );
+        return apply_filters( 'bp_get_blog_name', $name );
     }
 

trunk/tests/phpunit/testcases/blogs/template.php

@@ -444 +444 @@
     }
 
+    /**
+     * @BP9228
+     * @group avatar
+     * @group BP_Blogs_Template
+     * @group bp_get_blog_avatar
+     */
+    public function test_bp_get_blog_default_avatar_inside_blogs_template() {
+        $this->skipWithoutMultisite();
+
+        $b1 = self::factory()->blog->create();
+        $b2 = self::factory()->blog->create();
+
+        // Fake the global
+        global $blogs_template;
+
+        $blogs_template = new stdClass;
+        $blogs_template->blog = new stdClass;
+        $blogs_template->blog->blog_id = $b1;
+
+        $expected = buddypress()->plugin_url . "bp-core/images/mystery-blog.png";
+
+        // Get from global blog_id.
+        $avatar = bp_get_blog_avatar();
+        $this->assertTrue( str_contains( $avatar, "blog-{$b1}-avatar" ) );
+        $this->assertTrue( str_contains( $avatar, $expected ) );
+
+        // Get from the blog_id passed in, instead of global.
+        $avatar = bp_get_blog_avatar( array( 'blog_id' => $b2 ) );
+        $this->assertTrue( str_contains( $avatar, "blog-{$b2}-avatar" ) );
+        $this->assertTrue( str_contains( $avatar, $expected ) );
+
+        $blogs_template = null;
+    }
+
     public function filter_blog_avatar() {
         return BP_TESTS_DIR . 'assets/upside-down.jpg';