Changes in trunk/wp-admin/users.php [15011:15152]

File:

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

trunk/wp-admin/users.php

@@ -22 +22 @@
 add_contextual_help($current_screen,
     '<p>' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options when they are logged in, based on their role.') . '</p>' .
-    '<p>' . __('You can customize the display of information on this screen as you can on other screens, by using the Screen Options tab and the on-screen filters.') . '</p>' . 
-    '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Appearance menu section.') . '</p>' . 
+    '<p>' . __('You can customize the display of information on this screen as you can on other screens, by using the Screen Options tab and the on-screen filters.') . '</p>' .
+    '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>' .
     '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a target="_blank" href=http://codex.wordpress.org/Users_Authors_and_Users_SubPanel">Documentation on Authors and Users</a>') . '</p>' .
-    '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Roles_and_Capabilities">Roles and Capabilities Descriptions</a>') . '</p>' .
-    '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>' 
+    '<p>' . __('<a href="http://codex.wordpress.org/Users_Authors_and_Users_SubPanel" target="_blank">Documentation on Authors and Users</a>') . '</p>' .
+    '<p>' . __('<a href="http://codex.wordpress.org/Roles_and_Capabilities" target="_blank">Roles and Capabilities Descriptions</a>') . '</p>' .
+    '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
@@ -67 +67 @@
     $update = 'promote';
     foreach ( $userids as $id ) {
+        $id = (int) $id;
+
         if ( ! current_user_can('promote_user', $id) )
             wp_die(__('You can&#8217;t edit that user.'));
@@ -75 +77 @@
         }
 
+        // If the user doesn't already belong to the blog, bail.
+        if ( is_multisite() && !is_user_member_of_blog( $id ) )
+            wp_die(__('Cheatin&#8217; uh?'));
+
         $user = new WP_User($id);
         $user->set_role($_REQUEST['new_role']);
@@ -103 +109 @@
 
     foreach ( (array) $userids as $id) {
+        $id = (int) $id;
+
         if ( ! current_user_can( 'delete_user', $id ) )
             wp_die(__( 'You can&#8217;t delete that user.' ) );