Changeset 3859

Timestamp:

06/10/2006 08:26:26 PM (19 years ago)

Author:

ryan

Message:

Better handling of users with no role. Props Mark Jaquith. #2809

Location:

trunk

Files:

• wp-admin/user-edit.php (modified) (1 diff)
• wp-admin/users.php (modified) (1 diff)
• wp-includes/capabilities.php (modified) (2 diffs)
• wp-includes/registration-functions.php (modified) (1 diff)

trunk/wp-admin/user-edit.php

@@ -104 +104 @@
 // print_r($profileuser);
 echo '<select name="role">';
+$role_list = '';
+$user_has_role = false;
 foreach($wp_roles->role_names as $role => $name) {
-    $selected = ($profileuser->has_cap($role)) ? ' selected="selected"' : '';
-    echo "<option value=\"{$role}\"{$selected}>{$name}</option>";
-}
-echo '</select>';
+    if ( $profileuser->has_cap($role) ) {
+        $selected = ' selected="selected"';
+        $user_has_role = true;
+    } else {
+        $selected = '';
+    }
+    $role_list .= "<option value=\"{$role}\"{$selected}>{$name}</option>";
+}
+if ( $user_has_role )
+    $role_list .= '<option value="">' . __('&mdash; No role for this blog &mdash;') . '</option>';
+else
+    $role_list .= '<option value="" selected="selected">' . __('&mdash; No role for this blog &mdash;') . '</option>';
+echo $role_list . '</select>';
 ?></label></p>
 

trunk/wp-admin/users.php

@@ -314 +314 @@
 
 <tr>
+<?php if ( !empty($role) ) : ?>
     <th colspan="7" align="left"><h3><?php echo $wp_roles->role_names[$role]; ?></h3></th>
+<?php else : ?>
+    <th colspan="7" align="left"><h3><em><?php _e('No role for this blog'); ?></h3></th>
+<?php endif; ?>
 </tr>
 <tr class="thead">

trunk/wp-includes/capabilities.php

@@ -175 +175 @@
         //Build $allcaps from role caps, overlay user's $caps
         $this->allcaps = array();
-        foreach($this->roles as $role) {
+        foreach( (array) $this->roles as $role) {
             $role = $wp_roles->get_role($role);
             $this->allcaps = array_merge($this->allcaps, $role->capabilities);
@@ -200 +200 @@
         foreach($this->roles as $oldrole)
             unset($this->caps[$oldrole]);
-        $this->caps[$role] = true;
-        $this->roles = array($role => true);
+        if ( !empty($role) ) {
+            $this->caps[$role] = true;
+            $this->roles = array($role => true);
+        } else {
+            $this->roles = false;
+        }
         update_usermeta($this->id, $this->cap_key, $this->caps);
         $this->get_role_caps();

trunk/wp-includes/registration-functions.php

@@ -103 +103 @@
     update_usermeta( $user_id, 'yim', $yim );
 
-    if ($update && !empty($role)) {
+    if ( $update ) {
         $user = new WP_User($user_id);
         $user->set_role($role);