Changeset 15315 for trunk/wp-admin/includes/user.php

Timestamp:

06/24/2010 03:01:29 PM (14 years ago)

Author:

ryan

Message:

Use get_current_user() and get_current_user_id() instead of global . Props filofo. see #13934 for trunk

File:

• trunk/wp-admin/includes/user.php (modified) (4 diffs)

trunk/wp-admin/includes/user.php

@@ -22 +22 @@
 function add_user() {
     if ( func_num_args() ) { // The hackiest hack that ever did hack
-        global $current_user, $wp_roles;
+        global $wp_roles;
         $user_id = (int) func_get_arg( 0 );
 
@@ -28 +28 @@
             $new_role = sanitize_text_field( $_POST['role'] );
             // Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
-            if ( $user_id != $current_user->id || $wp_roles->role_objects[$new_role]->has_cap( 'edit_users' ) ) {
+            if ( $user_id != get_current_user_id() || $wp_roles->role_objects[$new_role]->has_cap( 'edit_users' ) ) {
                 // If the new role isn't editable by the logged-in user die with error
                 $editable_roles = get_editable_roles();
@@ -55 +55 @@
  */
 function edit_user( $user_id = 0 ) {
-    global $current_user, $wp_roles, $wpdb;
+    global $wp_roles, $wpdb;
     if ( $user_id != 0 ) {
         $update = true;
@@ -80 +80 @@
         // Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
         // Multisite super admins can freely edit their blog roles -- they possess all caps.
-        if ( ( is_multisite() && current_user_can( 'manage_sites' ) ) || $user_id != $current_user->id || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
+        if ( ( is_multisite() && current_user_can( 'manage_sites' ) ) || $user_id != get_current_user_id() || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
             $user->role = $new_role;