Changeset 7745

Timestamp:

01/21/2014 12:16:37 AM (11 years ago)

Author:

imath

Message:

On single group screens, uses default avatar as a fallback in group navigation menu

In case the WordPress Discussion Avatar display setting is disabled, using bp_group_current_avatar() to set group navigation menu was outputing an unfound image making the group edit screens unavailable. This fix uses default avatar as a fallback if no group avatar has been found to build the group navigation menu. It also keeps bp_group_current_avatar() function in case it is still used by a plugin or a theme, but this function now outputs the current avatar.

Fixes #5343

Location:

trunk/bp-groups

Files:

• bp-groups-loader.php (modified) (1 diff)
• bp-groups-template.php (modified) (1 diff)

trunk/bp-groups/bp-groups-loader.php

@@ -592 +592 @@
 
                 if ( empty( $bp->bp_options_avatar ) ) {
-                    $bp->bp_options_avatar = bp_group_current_avatar();
+                    $bp->bp_options_avatar = '<img src="' . esc_url( bp_core_avatar_default_thumb() ) . '" alt="' . esc_attr__( 'No Group Avatar', 'buddypress' ) . '" class="avatar" />';
                 }
             }

trunk/bp-groups/bp-groups-template.php

@@ -2627 +2627 @@
  **/
 
-function bp_group_current_avatar() {
-    global $bp;
-
-    if ( $bp->groups->current_group->avatar_full ) { ?>
-
-        <img src="<?php echo esc_url( $bp->groups->current_group->avatar_full ); ?>" alt="<?php _e( 'Group Avatar', 'buddypress' ) ?>" class="avatar" />
-
-    <?php } else { ?>
-
-        <img src="<?php echo esc_url( $bp->groups->image_base . '/none.gif' ); ?>" alt="<?php _e( 'No Group Avatar', 'buddypress' ) ?>" class="avatar" />
-
-    <?php }
-}
+/**
+ * Outputs the current group avatar
+ *
+ * @since BuddyPress (1.0)
+ * @param string $type thumb or full ?
+ * @uses bp_get_group_current_avatar() to get the avatar of the current group
+ */
+function bp_group_current_avatar( $type = 'thumb' ) {
+    echo bp_get_group_current_avatar( $type );
+}
+    
+    /**
+     * Returns the current group avatar
+     *
+     * @since BuddyPress (2.0)
+     * @param string $type thumb or full ?
+     * @uses bp_core_fetch_avatar() to get the avatar of the group
+     * @uses bp_get_current_group_id() to get current group id
+     * @uses apply_filters() Filter bp_get_group_current_avatar to modify return value
+     * @return string $tab The current tab's slug
+     */
+    function bp_get_group_current_avatar( $type = 'thumb' ) {
+
+        $group_avatar = bp_core_fetch_avatar( array(
+            'item_id'    => bp_get_current_group_id(),
+            'object'     => 'group',
+            'type'       => $type,
+            'avatar_dir' => 'group-avatars',
+            'alt'        => __( 'Group avatar', 'buddypress' ),
+            'class'      => 'avatar'
+        ) );
+
+        return apply_filters( 'bp_get_group_current_avatar', $group_avatar );
+    }
 
 function bp_get_group_has_avatar() {