Changeset 5301 for trunk/bp-settings/bp-settings-actions.php

Timestamp:

11/08/2011 01:14:31 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Use bp_displayed_user_id() rather than reference the $bp->displayed_user->id global var directly. First step at consolidating user ID checks to use WP_User class later. See #3738.

File:

• trunk/bp-settings/bp-settings-actions.php (modified) (4 diffs)

trunk/bp-settings/bp-settings-actions.php

@@ -22 +22 @@
 
         // Validate the user again for the current password when making a big change
-        if ( is_super_admin() || ( !empty( $_POST['pwd'] ) && $_POST['pwd'] != '' && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, $bp->displayed_user->id ) ) ) {
+        if ( is_super_admin() || ( !empty( $_POST['pwd'] ) && $_POST['pwd'] != '' && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, bp_displayed_user_id() ) ) ) {
 
-            $update_user = get_userdata( $bp->displayed_user->id );
+            $update_user = get_userdata( bp_displayed_user_id() );
 
             // Make sure changing an email address does not already exist
@@ -83 +83 @@
             // Make sure these changes are in $bp for the current page load
             if ( ( false === $email_error ) && ( false === $pass_error ) && ( wp_update_user( get_object_vars( $update_user ) ) ) ) {
-                $bp->displayed_user->userdata = bp_core_get_core_userdata( $bp->displayed_user->id );
+                $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
                 $bp_settings_updated = true;
             }
@@ -129 +129 @@
             foreach ( (array)$_POST['notifications'] as $key => $value ) {
                 if ( $meta_key = bp_get_user_meta_key( $key ) )
-                    bp_update_user_meta( (int)$bp->displayed_user->id, $meta_key, $value );
+                    bp_update_user_meta( (int)bp_displayed_user_id(), $meta_key, $value );
             }
         }
@@ -156 +156 @@
 
         // delete the users account
-        if ( bp_core_delete_account( $bp->displayed_user->id ) ) {
+        if ( bp_core_delete_account( bp_displayed_user_id() ) ) {
             bp_core_redirect( home_url() );
         }