Changeset 12559 for trunk/src/bp-xprofile/classes/class-bp-xprofile-component.php

Timestamp:

02/29/2020 04:09:19 PM (5 years ago)

Author:

imath

Message:

Move Avatars & Cover from xProfile to Members component : step 6

Move the Avatars & Cover navigation and the Avatars REST Controllers from the xProfile Component to the Members one.

See #8156

File:

• trunk/src/bp-xprofile/classes/class-bp-xprofile-component.php (modified) (4 diffs)

trunk/src/bp-xprofile/classes/class-bp-xprofile-component.php

@@ -113 +113 @@
             require $this->path . 'bp-xprofile/screens/public.php';
 
-            // Action - Delete avatar.
-            if ( is_user_logged_in()&& bp_is_user_change_avatar() && bp_is_action_variable( 'delete-avatar', 0 ) ) {
-                require $this->path . 'bp-xprofile/actions/delete-avatar.php';
-            }
-
             // Sub-nav items.
-            if ( is_user_logged_in() &&
-                in_array( bp_current_action(), array( 'edit', 'change-avatar', 'change-cover-image' ), true )
-            ) {
-                require $this->path . 'bp-xprofile/screens/' . bp_current_action() . '.php';
+            if ( is_user_logged_in() && 'edit' === bp_current_action() ) {
+                require $this->path . 'bp-xprofile/screens/edit.php';
             }
         }
@@ -279 +272 @@
         );
 
-        // Change Avatar.
-        if ( buddypress()->avatar->show_avatars ) {
-            $sub_nav[] = array(
-                'name'            => _x( 'Change Profile Photo', 'Profile header sub menu', 'buddypress' ),
-                'slug'            => 'change-avatar',
-                'parent_url'      => $profile_link,
-                'parent_slug'     => $slug,
-                'screen_function' => 'xprofile_screen_change_avatar',
-                'position'        => 30,
-                'user_has_access' => $access
-            );
-        }
-
-        // Change Cover image.
-        if ( bp_displayed_user_use_cover_image_header() ) {
-            $sub_nav[] = array(
-                'name'            => _x( 'Change Cover Image', 'Profile header sub menu', 'buddypress' ),
-                'slug'            => 'change-cover-image',
-                'parent_url'      => $profile_link,
-                'parent_slug'     => $slug,
-                'screen_function' => 'xprofile_screen_change_cover_image',
-                'position'        => 40,
-                'user_has_access' => $access
-            );
-        }
-
         // The Settings > Profile nav item can only be set up after
         // the Settings component has run its own nav routine.
@@ -388 +355 @@
                 'position' => 20
             );
-
-            // Edit Avatar.
-            if ( buddypress()->avatar->show_avatars ) {
-                $wp_admin_nav[] = array(
-                    'parent'   => 'my-account-' . $this->id,
-                    'id'       => 'my-account-' . $this->id . '-change-avatar',
-                    'title'    => _x( 'Change Profile Photo', 'My Account Profile sub nav', 'buddypress' ),
-                    'href'     => trailingslashit( $profile_link . 'change-avatar' ),
-                    'position' => 30
-                );
-            }
-
-            if ( bp_displayed_user_use_cover_image_header() ) {
-                $wp_admin_nav[] = array(
-                    'parent'   => 'my-account-' . $this->id,
-                    'id'       => 'my-account-' . $this->id . '-change-cover-image',
-                    'title'    => _x( 'Change Cover Image', 'My Account Profile sub nav', 'buddypress' ),
-                    'href'     => trailingslashit( $profile_link . 'change-cover-image' ),
-                    'position' => 40
-                );
-            }
         }
 
@@ -504 +450 @@
             'BP_REST_XProfile_Field_Groups_Endpoint',
             'BP_REST_XProfile_Data_Endpoint',
-            'BP_REST_Attachments_Member_Avatar_Endpoint',
         ) );
     }