Changeset 12636

Timestamp:

04/29/2020 12:51:50 PM (5 years ago)

Author:

imath

Message:

Blogs: Add a new argument to the function used to fetch a blog avatar

The html argument makes it possible to only get the raw URL of the blog avatar.

Fixes #8286

File:

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

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

@@ -303 +303 @@
      *
      * @since 2.4.0 Introduced `$title` argument.
-     * @since 6.0.0 Introduced the `$blog_id` & `$admin_user_id` arguments.
+     * @since 6.0.0 Introduced the `$blog_id`, `$admin_user_id` and `html` arguments.
      *
      * @see bp_core_fetch_avatar() For a description of arguments and
@@ -321 +321 @@
      *     @type int      $blog_id       The blog ID. Default: O.
      *     @type int      $admin_user_id The Blog Admin user ID. Default: 0.
+     *     @type bool     $html          Default: true.
      * }
      * @return string User avatar string.
@@ -365 +366 @@
             ),
             'no_grav' => false,
+            'html'    => true,
         ) );
 
@@ -408 +410 @@
             // We have a site icon.
             if ( ! is_numeric( $site_icon ) ) {
+                // Just return the raw url of the Site Icon.
+                if ( ! $r['html'] ) {
+                    return esc_url_raw( $site_icon );
+                }
+
                 if ( empty( $r['width'] ) && ! isset( $size ) ) {
                     $size = 'full' === $r['type'] ? bp_core_avatar_full_width() : bp_core_avatar_thumb_width();
@@ -432 +439 @@
         if ( '' === $avatar ) {
             $avatar = bp_core_fetch_avatar( array(
-                'item_id'    => $admin_user_id,
+                'item_id' => $admin_user_id,
                 // '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'],
-                'no_grav'    => $r['no_grav'],
+                'type'    => $r['type'],
+                'alt'     => $r['alt'],
+                'css_id'  => $r['id'],
+                'class'   => $r['class'],
+                'width'   => $r['width'],
+                'height'  => $r['height'],
+                'no_grav' => $r['no_grav'],
+                'html'    => $r['html'],
             ) );
         }