Changeset 7747

Timestamp:

01/21/2014 01:47:10 AM (11 years ago)

Author:

imath

Message:

Does not display change-avatar user nav and screens if WordPress Show avatars setting is disabled

If WordPress discussion Avatar display setting is not activated, then displaying change-avatar user nav and screens is not necessary and might confuse the user as his uploaded avatar will not display.

Fixes #5346

Location:

trunk

Files:

• bp-members/bp-members-adminbar.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-loader.php (modified) (2 diffs)

trunk/bp-members/bp-members-adminbar.php

@@ -93 +93 @@
     ) );
 
-    if( bp_is_active( 'xprofile' ) ) {
+    if ( bp_is_active( 'xprofile' ) ) {
         // User Admin > Edit this user's profile
         $wp_admin_bar->add_menu( array(
@@ -103 +103 @@
 
         // User Admin > Edit this user's avatar
-        $wp_admin_bar->add_menu( array(
-            'parent' => $bp->user_admin_menu_id,
-            'id'     => $bp->user_admin_menu_id . '-change-avatar',
-            'title'  => __( "Edit Avatar", 'buddypress' ),
-            'href'   => bp_get_members_component_link( 'profile', 'change-avatar' )
-        ) );
+        if ( buddypress()->avatar->show_avatars ) {
+            $wp_admin_bar->add_menu( array(
+                'parent' => $bp->user_admin_menu_id,
+                'id'     => $bp->user_admin_menu_id . '-change-avatar',
+                'title'  => __( "Edit Avatar", 'buddypress' ),
+                'href'   => bp_get_members_component_link( 'profile', 'change-avatar' )
+            ) );
+        }
+
     }
 

trunk/bp-xprofile/bp-xprofile-loader.php

@@ -201 +201 @@
 
         // Change Avatar
-        $sub_nav[] = array(
-            'name'            => __( 'Change Avatar', 'buddypress' ),
-            'slug'            => 'change-avatar',
-            'parent_url'      => $profile_link,
-            'parent_slug'     => $this->slug,
-            'screen_function' => 'xprofile_screen_change_avatar',
-            'position'        => 30,
-            'user_has_access' => bp_core_can_edit_settings()
-        );
+        if ( buddypress()->avatar->show_avatars ) {
+            $sub_nav[] = array(
+                'name'            => __( 'Change Avatar', 'buddypress' ),
+                'slug'            => 'change-avatar',
+                'parent_url'      => $profile_link,
+                'parent_slug'     => $this->slug,
+                'screen_function' => 'xprofile_screen_change_avatar',
+                'position'        => 30,
+                'user_has_access' => bp_core_can_edit_settings()
+            );
+        }
 
         parent::setup_nav( $main_nav, $sub_nav );
@@ -253 +255 @@
             );
 
-            // Edit Profile
-            $wp_admin_nav[] = array(
-                'parent' => 'my-account-' . $this->id,
-                'id'     => 'my-account-' . $this->id . '-change-avatar',
-                'title'  => __( 'Change Avatar', 'buddypress' ),
-                'href'   => trailingslashit( $profile_link . 'change-avatar' )
-            );
+            // Edit Avatar
+            if ( buddypress()->avatar->show_avatars ) {
+                $wp_admin_nav[] = array(
+                    'parent' => 'my-account-' . $this->id,
+                    'id'     => 'my-account-' . $this->id . '-change-avatar',
+                    'title'  => __( 'Change Avatar', 'buddypress' ),
+                    'href'   => trailingslashit( $profile_link . 'change-avatar' )
+                );
+            }
 
         }