Changeset 13961

Timestamp:

04/03/2010 08:08:12 AM (15 years ago)

Author:

nacin

Message:

Allow "No role for this blog" to be chosen on user-edit. Add defensive checks for a few potential notices. fixes #10833

Location:

trunk/wp-admin

Files:

• includes/user.php (modified) (2 diffs)
• users.php (modified) (1 diff)

trunk/wp-admin/includes/user.php

@@ -31 +31 @@
                 // If the new role isn't editable by the logged-in user die with error
                 $editable_roles = get_editable_roles();
-                if ( !$editable_roles[$new_role] )
+                if ( empty( $editable_roles[$new_role] ) )
                     wp_die(__('You can’t give users that role.'));
 
@@ -85 +85 @@
         // If the new role isn't editable by the logged-in user die with error
         $editable_roles = get_editable_roles();
-        if ( !$editable_roles[$new_role] )
+        if ( ! empty( $new_role ) && empty( $editable_roles[$new_role] ) )
             wp_die(__('You can’t give users that role.'));
     }

trunk/wp-admin/users.php

@@ -58 +58 @@
 
     $editable_roles = get_editable_roles();
-    if ( !$editable_roles[$_REQUEST['new_role']] )
+    if ( empty( $editable_roles[$_REQUEST['new_role']] ) )
         wp_die(__('You can’t give users that role.'));