Changeset 21414 for trunk/wp-admin/network/site-users.php

Timestamp:

08/03/2012 05:51:42 PM (12 years ago)

Author:

ryan

Message:

Deprecate get_blog_option(), add_blog_option(), update_blog_option(), and delete_blog_option().

Use the regular option functions wrapped in switch_to_blog() and restore_current_blog() instead.

Group multiple operations within a single switch where possible.

fixes #21432

File:

• trunk/wp-admin/network/site-users.php (modified) (5 diffs)

trunk/wp-admin/network/site-users.php

@@ -46 +46 @@
 
 $details = get_blog_details( $id );
-if ( !can_edit_network( $details->site_id ) )
+if ( ! can_edit_network( $details->site_id ) )
     wp_die( __( 'You do not have permission to access this page.' ) );
 
 $is_main_site = is_main_site( $id );
 
-// get blog prefix
-$blog_prefix = $wpdb->get_blog_prefix( $id );
-
-// @todo This is a hack. Eventually, add API to WP_Roles allowing retrieval of roles for a particular blog.
-if ( ! empty($wp_roles->use_db) ) {
-    $editblog_roles = get_blog_option( $id, "{$blog_prefix}user_roles" );
-} else {
-    // Roles are stored in memory, not the DB.
-    $editblog_roles = $wp_roles->roles;
-}
-$default_role = get_blog_option( $id, 'default_role' );
+switch_to_blog( $id );
+
+$editblog_roles = $wp_roles->roles;
+
+$default_role = get_option( 'default_role' );
 
 $action = $wp_list_table->current_action();
 
 if ( $action ) {
-    switch_to_blog( $id );
 
     switch ( $action ) {
@@ -72 +65 @@
             check_admin_referer( 'add-user', '_wpnonce_add-new-user' );
             $user = $_POST['user'];
-            if ( !is_array( $_POST['user'] ) || empty( $user['username'] ) || empty( $user['email'] ) ) {
+            if ( ! is_array( $_POST['user'] ) || empty( $user['username'] ) || empty( $user['email'] ) ) {
                 $update = 'err_new';
             } else {
@@ -95 +88 @@
                 $userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) );
                 if ( $userid ) {
+                    $blog_prefix = $wpdb->get_blog_prefix( $id );
                     $user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='{$blog_prefix}capabilities'" );
                     if ( $user == false )
@@ -109 +103 @@
 
         case 'remove':
-            if ( !current_user_can('remove_users')  )
+            if ( ! current_user_can( 'remove_users' )  )
                 die(__('You can’t remove users.'));
             check_admin_referer( 'bulk-users' );
@@ -153 +147 @@
     }
 
-    restore_current_blog();
     wp_safe_redirect( add_query_arg( 'update', $update, $referer ) );
     exit();
 }
+
+restore_current_blog();
 
 if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {