Ticket #6372: 6372.diff

src/bp-core/bp-core-avatars.php

@@ -671 +671 @@
                  * @param string $value  Default avatar for non-gravatar requests.
                  * @param array  $params Array of parameters for the avatar request.
                  */
-                $gravatar = apply_filters( 'bp_core_default_avatar_' . $params['object'], bp_core_avatar_default( 'local' ), $params );
+                $gravatar = apply_filters( 'bp_core_default_avatar_' . $params['object'], bp_core_avatar_default( 'local', $params ), $params );
         }
 
         if ( true === $params['html'] ) {
@@ -1845 +1845 @@
  * Get the URL of the 'full' default avatar.
  *
  * @since 1.5.0
+ * @since 2.6.0 Introduced `$params` and `$object_type` parameters.
  *
- * @param string $type 'local' if the fallback should be the locally-hosted version
- *                     of the mystery-person, 'gravatar' if the fallback should be
- *                     Gravatar's version. Default: 'gravatar'.
+ * @param string $type   'local' if the fallback should be the locally-hosted version
+ *                       of the mystery person, 'gravatar' if the fallback should be
+ *                       Gravatar's version. Default: 'gravatar'.
+ * @param array  $params Parameters passed to bp_core_fetch_avatar().
  * @return string The URL of the default avatar.
  */
-function bp_core_avatar_default( $type = 'gravatar' ) {
+function bp_core_avatar_default( $type = 'gravatar', $params = array() ) {
         // Local override.
         if ( defined( 'BP_AVATAR_DEFAULT' ) ) {
                 $avatar = BP_AVATAR_DEFAULT;
@@ -1869 +1871 @@
          * Filters the URL of the 'full' default avatar.
          *
          * @since 1.5.0
+         * @since 2.6.0 Added `$type` and `$params`.
          *
          * @param string $avatar URL of the default avatar.
+         * @param array  $params Params provided to bp_core_fetch_avatar().
          */
-        return apply_filters( 'bp_core_avatar_default', $avatar );
+        return apply_filters( 'bp_core_avatar_default', $avatar, $params );
 }
 
 /**
@@ -1882 +1886 @@
  * defined.
  *
  * @since 1.5.0
+ * @since 2.6.0 Introduced `$object_type` parameter.
  *
- * @param string $type 'local' if the fallback should be the locally-hosted version
- *                     of the mystery-person, 'gravatar' if the fallback should be
- *                     Gravatar's version. Default: 'gravatar'.
+ * @param string $type   'local' if the fallback should be the locally-hosted version
+ *                       of the mystery person, 'gravatar' if the fallback should be
+ *                       Gravatar's version. Default: 'gravatar'.
+ * @param array  $params Parameters passed to bp_core_fetch_avatar().
  * @return string The URL of the default avatar thumb.
  */
-function bp_core_avatar_default_thumb( $type = 'gravatar' ) {
+function bp_core_avatar_default_thumb( $type = 'gravatar', $params = array() ) {
         // Local override.
         if ( defined( 'BP_AVATAR_DEFAULT_THUMB' ) ) {
                 $avatar = BP_AVATAR_DEFAULT_THUMB;
@@ -1906 +1912 @@
          * Filters the URL of the 'thumb' default avatar.
          *
          * @since 1.5.0
+         * @since 2.6.0 Added `$type` and `$params`.
          *
          * @param string $avatar URL of the default avatar.
+         * @param string $type   'local' or 'gravatar'.
+         * @param string $params Params provided to bp_core_fetch_avatar().
          */
-        return apply_filters( 'bp_core_avatar_thumb', $avatar );
+        return apply_filters( 'bp_core_avatar_thumb', $avatar, $params );
 }
 
 /**

src/bp-groups/bp-groups-filters.php

@@ -73 +73 @@
 // Activity component integration.
 add_filter( 'bp_activity_at_name_do_notifications', 'bp_groups_disable_at_mention_notification_for_non_public_groups', 10, 4 );
 
+// Default group avatar.
+add_filter( 'bp_core_avatar_default',       'bp_groups_default_avatar', 10, 3 );
+add_filter( 'bp_core_avatar_default_thumb', 'bp_groups_default_avatar', 10, 3 );
+
 /**
  * Filter output of Group Description through WordPress's KSES API.
  *
@@ -319 +323 @@
 
         return $send;
 }
+
+/**
+ * Use the mystery group avatar for groups.
+ *
+ * @since 2.6.0
+ *
+ * @param string $avatar Current avatar src.
+ * @param array  $params Avatar params.
+ * @return string
+ */
+function bp_groups_default_avatar( $avatar, $params ) {
+        if ( isset( $params['object'] ) && 'group' === $params['object'] ) {
+                if ( isset( $params['type'] ) && 'thumb' === $params['type'] ) {
+                        $file = 'mystery-group-50.png';
+                } else {
+                        $file = 'mystery-group.png';
+                }
+
+                $avatar = buddypress()->plugin_url . "bp-core/images/$file";
+        }
+
+        return $avatar;
+}

src/bp-groups/bp-groups-template.php

@@ -599 +599 @@
                         'css_id'     => $r['id'],
                         'class'      => $r['class'],
                         'width'      => $r['width'],
-                        'height'     => $r['height']
+                        'height'     => $r['height'],
+                        'no_grav'    => true,
                 ) );
 
                 // If No avatar found, provide some backwards compatibility.
@@ -4705 +4706 @@
                         'class'   => 'avatar',
                         'id'      => 'avatar-crop-preview',
                         'alt'     => __( 'Group photo', 'buddypress' ),
-                        'no_grav' => false
                 ), 'get_new_group_avatar' );
 
                 // Merge parsed arguments with object specific data.
@@ -5148 +5148 @@
                 $group_id = bp_get_current_group_id();
         }
 
-        $group_avatar = bp_core_fetch_avatar( array(
+        $avatar_args = array(
                 'item_id' => $group_id,
                 'object'  => 'group',
                 'no_grav' => true,
                 'html'    => false,
-        ) );
+        );
+
+        $group_avatar = bp_core_fetch_avatar( $avatar_args );
 
-        if ( bp_core_avatar_default( 'local' ) === $group_avatar ) {
+        if ( bp_core_avatar_default( 'local', $avatar_args ) === $group_avatar ) {
                 return false;
         }