Changeset 8737

Timestamp:

07/30/2014 05:36:09 PM (12 years ago)

Author:

imath

Message:

Disable Group avatar feature if WordPress show avatars setting is disabled

In WordPress Administration Discussion settings, if the option "Show Avatars" is not on, we need to disable the Group Avatar feature to avoid some notices and be consistent with the discussion option.

Fixes #5345
See #5494

Location:

trunk/src

Files:

• bp-core/deprecated/2.1.php (modified) (1 diff)
• bp-groups/bp-groups-admin.php (modified) (1 diff)
• bp-groups/bp-groups-adminbar.php (modified) (1 diff)
• bp-groups/bp-groups-loader.php (modified) (1 diff)
• bp-groups/bp-groups-screens.php (modified) (1 diff)
• bp-groups/bp-groups-template.php (modified) (3 diffs)

trunk/src/bp-core/deprecated/2.1.php

@@ -388 +388 @@
             <li><a href="<?php bp_groups_action_link( 'admin/group-settings' );  ?>"><?php _e( 'Group Settings', 'buddypress' ); ?></a></li>
 
-            <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
+            <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && $bp->avatar->show_avatars ) : ?>
 
                 <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Profile Photo', 'buddypress' ); ?></a></li>

trunk/src/bp-groups/bp-groups-admin.php

@@ -1405 +1405 @@
 
         // Get group name and avatar
-        $avatar  = bp_core_fetch_avatar( array(
-            'item_id'    => $item['id'],
-            'object'     => 'group',
-            'type'       => 'thumb',
-            'avatar_dir' => 'group-avatars',
-            'alt'        => sprintf( __( 'Group logo of %s', 'buddypress' ), $group_name ),
-            'width'      => '32',
-            'height'     => '32',
-            'title'      => $group_name
-        ) );
+        $avatar = '';
+
+        if ( buddypress()->avatar->show_avatars ) {
+            $avatar  = bp_core_fetch_avatar( array(
+                'item_id'    => $item['id'],
+                'object'     => 'group',
+                'type'       => 'thumb',
+                'avatar_dir' => 'group-avatars',
+                'alt'        => sprintf( __( 'Group logo of %s', 'buddypress' ), $group_name ),
+                'width'      => '32',
+                'height'     => '32',
+                'title'      => $group_name
+            ) );
+        }
 
         $content = sprintf( '<strong><a href="%s">%s</a></strong>', esc_url( $edit_url ), $group_name );

trunk/src/bp-groups/bp-groups-adminbar.php

@@ -58 +58 @@
 
     // Group Admin > Group avatar
-    if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) {
+    if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && $bp->avatar->show_avatars ) {
         $wp_admin_bar->add_menu( array(
             'parent' => $bp->group_admin_menu_id,

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

@@ -254 +254 @@
 
         // If avatar uploads are not disabled, add avatar option
-        if ( ! (int) buddypress()->site_options['bp-disable-avatar-uploads'] ) {
+        if ( ! (int) $bp->site_options['bp-disable-avatar-uploads'] && $bp->avatar->show_avatars ) {
             $this->group_creation_steps['group-avatar'] = array(
                 'name'     => _x( 'Profile Photo', 'Group screen nav', 'buddypress' ),

trunk/src/bp-groups/bp-groups-screens.php

@@ -635 +635 @@
 
     // If the logged-in user doesn't have permission or if avatar uploads are disabled, then stop here
-    if ( ! bp_is_item_admin() || (int) bp_get_option( 'bp-disable-avatar-uploads' ) )
+    if ( ! bp_is_item_admin() || (int) bp_get_option( 'bp-disable-avatar-uploads' ) || ! buddypress()->avatar->show_avatars )
         return false;
 

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

@@ -556 +556 @@
         global $bp, $groups_template;
 
+        if ( ! buddypress()->avatar->show_avatars ) {
+            return false;
+        }
+
         $defaults = array(
             'type'   => 'full',
@@ -1559 +1563 @@
     <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-settings' ) ?>"><?php _e( 'Settings', 'buddypress' ); ?></a></li>
 
-    <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
+    <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) && buddypress()->avatar->show_avatars ) : ?>
 
         <li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-avatar' ) ?>"><?php _e( 'Profile Photo', 'buddypress' ); ?></a></li>
@@ -1709 +1713 @@
             $group = $groups_template->group;
         }
-    
+
         if ( empty( $user_id ) ) {
             $user_id = bp_loggedin_user_id();