Changeset 11928 for trunk/src/bp-xprofile/screens/settings-profile.php

Timestamp:

04/02/2018 04:32:31 AM (7 years ago)

Author:

r-a-y

Message:

XProfile: Conditionally load action and screen functions.

This commit conditionally loads action and screen function code for the
XProfile component, utilizing the 'bp_late_include' hook introduced in
r11884.

Previously, we loaded these functions at all times, which is unnecessary
when a user is not on a BuddyPress extended profile page. Now, we only load
this code when needed.

See #7218.

Location:

trunk/src/bp-xprofile/screens

Files:

• . (added)
• settings-profile.php (moved) (moved from trunk/src/bp-xprofile/bp-xprofile-actions.php) (1 diff)

trunk/src/bp-xprofile/screens/settings-profile.php

@@ -1 +1 @@
 <?php
 /**
- * BuddyPress XProfile Actions.
- *
- * Action functions are exactly the same as screen functions, however they do not
- * have a template screen associated with them. Usually they will send the user
- * back to the default screen after execution.
+ * XProfile: User's "Settings > Profile Visibility" screen handler
  *
  * @package BuddyPress
- * @subpackage XProfileActions
- * @since 1.5.0
+ * @subpackage XProfileScreens
+ * @since 3.0.0
  */
 
-// Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
+/**
+ * Show the xprofile settings template.
+ *
+ * @since 2.0.0
+ */
+function bp_xprofile_screen_settings() {
 
-/**
- * This function runs when an action is set for a screen:
- * example.com/members/andy/profile/change-avatar/ [delete-avatar]
- *
- * The function will delete the active avatar for a user.
- *
- * @since 1.0.0
- *
- */
-function xprofile_action_delete_avatar() {
-
-    if ( ! bp_is_user_change_avatar() || ! bp_is_action_variable( 'delete-avatar', 0 ) ) {
-        return false;
+    // Redirect if no privacy settings page is accessible.
+    if ( bp_action_variables() || ! bp_is_active( 'xprofile' ) ) {
+        bp_do_404();
+        return;
     }
 
-    // Check the nonce.
-    check_admin_referer( 'bp_delete_avatar_link' );
-
-    if ( ! bp_is_my_profile() && ! bp_current_user_can( 'bp_moderate' ) ) {
-        return false;
-    }
-
-    if ( bp_core_delete_existing_avatar( array( 'item_id' => bp_displayed_user_id() ) ) ) {
-        bp_core_add_message( __( 'Your profile photo was deleted successfully!', 'buddypress' ) );
-    } else {
-        bp_core_add_message( __( 'There was a problem deleting your profile photo. Please try again.', 'buddypress' ), 'error' );
-    }
-
-    bp_core_redirect( wp_get_referer() );
+    /**
+     * Filters the template to load for the XProfile settings screen.
+     *
+     * @since 2.0.0
+     *
+     * @param string $template Path to the XProfile change avatar template to load.
+     */
+    bp_core_load_template( apply_filters( 'bp_settings_screen_xprofile', '/members/single/settings/profile' ) );
 }
-add_action( 'bp_actions', 'xprofile_action_delete_avatar' );
 
 /**