Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.176
diff -u -d -F^\s*function -r1.176 filter.module
--- modules/filter/filter.module	1 Jun 2007 09:39:10 -0000	1.176
+++ modules/filter/filter.module	3 Jun 2007 20:04:46 -0000
@@ -278,7 +278,7 @@ function filter_admin_overview() {
 
   foreach ($formats as $id => $format) {
     $roles = array();
-    foreach (user_roles() as $rid => $name) {
+    foreach (user_get_roles() as $rid => $name) {
       // Prepare a roles array with roles that may access the filter
       if (strstr($format->roles, ",$rid,")) {
         $roles[] = $name;
@@ -393,7 +393,7 @@ function filter_admin_format_form($forma
     '#tree' => TRUE,
   );
 
-  foreach (user_roles() as $rid => $name) {
+  foreach (user_get_roles() as $rid => $name) {
     $checked = strstr($format->roles, ",$rid,");
     $form['roles'][$rid] = array('#type' => 'checkbox',
       '#title' => $name,
@@ -496,7 +496,7 @@ function filter_admin_format_form_submit
       }
     }
   }
-  $roles = ','. implode(',', ($form_values['default_format'] ? array_keys(user_roles()) : $roles)) .',';
+  $roles = ','. implode(',', ($form_values['default_format'] ? array_keys(user_get_roles()) : $roles)) .',';
 
   db_query("UPDATE {filter_formats} SET cache = %d, name='%s', roles = '%s' WHERE format = %d", $cache, $name, $roles, $format);
 
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.163
diff -u -d -F^\s*function -r1.163 upload.module
--- modules/upload/upload.module	30 May 2007 08:08:59 -0000	1.163
+++ modules/upload/upload.module	3 Jun 2007 20:04:46 -0000
@@ -205,7 +205,7 @@ function upload_admin_settings() {
 
   $form['settings_general']['upload_max_size'] = array('#value' => '<p>'. t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))) .'</p>');
 
-  $roles = user_roles(0, 'upload files');
+  $roles = user_get_roles(FALSE, 'upload files');
   $form['roles'] = array('#type' => 'value', '#value' => $roles);
 
   foreach ($roles as $rid => $role) {
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.789
diff -u -d -F^\s*function -r1.789 user.module
--- modules/user/user.module	3 Jun 2007 06:17:58 -0000	1.789
+++ modules/user/user.module	3 Jun 2007 20:04:49 -0000
@@ -1454,7 +1454,7 @@ function user_edit_form($uid, $edit, $re
     $form['account']['status'] = array('#type' => 'radios', '#title' => t('Status'), '#default_value' => isset($edit['status']) ? $edit['status'] : 1, '#options' => array(t('Blocked'), t('Active')));
   }
   if (user_access('administer access control')) {
-    $roles = user_roles(1);
+    $roles = user_get_roles(TRUE);
     unset($roles[DRUPAL_AUTHENTICATED_RID]);
     if ($roles) {
       $default = empty($edit['roles']) ? array() : array_keys($edit['roles']);
@@ -1894,15 +1894,16 @@ function user_admin_access() {
 /**
  * Retrieve an array of roles matching specified conditions.
  *
- * @param $membersonly
- *   Set this to TRUE to exclude the 'anonymous' role.
+ * @param $only_members
+ *   (Optional) Set this to TRUE to exclude the 'anonymous user' role.
  * @param $permission
- *   A string containing a permission. If set, only roles containing that permission are returned.
+ *   (Optional) A string containing a permission. If set, only roles containing
+ *   that permission are returned.
  *
  * @return
  *   An associative array with the role id as the key and the role name as value.
  */
-function user_roles($membersonly = 0, $permission = 0) {
+function user_get_roles($only_members = FALSE, $permission = NULL) {
   $roles = array();
 
   if ($permission) {
@@ -1912,8 +1913,17 @@ function user_roles($membersonly = 0, $p
     $result = db_query('SELECT * FROM {role} ORDER BY name');
   }
   while ($role = db_fetch_object($result)) {
-    if (!$membersonly || ($membersonly && $role->rid != DRUPAL_ANONYMOUS_RID)) {
-      $roles[$role->rid] = $role->name;
+    if ($only_members == FALSE || $role->rid != DRUPAL_ANONYMOUS_RID) {
+      switch ($role->rid) {
+        case DRUPAL_ANONYMOUS_RID:
+          $roles[$role->rid] = t('Anonymous user');
+          break;
+        case DRUPAL_AUTHENTICATED_RID:
+          $roles[$role->rid] = t('Authenticated user');
+          break;
+        default:
+          $roles[$role->rid] = $role->name;
+      }
     }
   }
   return $roles;
@@ -1939,15 +1949,11 @@ function user_admin_perm($rid = NULL) {
   }
 
   if (is_numeric($rid)) {
-    $result = db_query('SELECT rid, name FROM {role} r WHERE r.rid = %d ORDER BY name', $rid);
+    $roles = user_get_roles();
+    $role_names = array($rid => $roles[$rid]);
   }
   else {
-    $result = db_query('SELECT rid, name FROM {role} ORDER BY name');
-  }
-
-  $role_names = array();
-  while ($role = db_fetch_object($result)) {
-    $role_names[$role->rid] = $role->name;
+    $role_names = user_get_roles();
   }
 
   // Render role/permission overview:
@@ -2038,9 +2044,9 @@ function user_admin_perm_submit($form, &
  * Menu callback: administer roles.
  */
 function user_admin_role() {
-  $id = arg(4);
-  if ($id) {
-    if (DRUPAL_ANONYMOUS_RID == $id || DRUPAL_AUTHENTICATED_RID == $id) {
+  $rid = arg(4);
+  if ($rid) {
+    if ($rid == DRUPAL_ANONYMOUS_RID || $rid == DRUPAL_AUTHENTICATED_RID) {
       drupal_goto('admin/user/roles');
     }
     // Display the edit role form.
@@ -2056,7 +2062,7 @@ function user_admin_role() {
     );
     $form['rid'] = array(
       '#type' => 'value',
-      '#value' => $id,
+      '#value' => $rid,
     );
     $form['submit'] = array(
       '#type' => 'submit',
@@ -2124,7 +2130,7 @@ function user_admin_role_submit($form, &
 
 function theme_user_admin_new_role($form) {
   $header = array(t('Name'), array('data' => t('Operations'), 'colspan' => 2));
-  foreach (user_roles() as $rid => $name) {
+  foreach (user_get_roles() as $rid => $name) {
     $edit_permissions = l(t('edit permissions'), 'admin/user/access/'. $rid);
     if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
       $rows[] = array($name, l(t('edit role'), 'admin/user/roles/edit/'. $rid), $edit_permissions);
@@ -2181,7 +2187,7 @@ function user_admin_account() {
   $destination = drupal_get_destination();
 
   $status = array(t('blocked'), t('active'));
-  $roles = user_roles(1);
+  $roles = user_get_roles(TRUE);
   $accounts = array();
   while ($account = db_fetch_object($result)) {
     $accounts[$account->uid] = '';
@@ -2300,7 +2306,7 @@ function user_user_operations() {
   );
 
   if (user_access('administer access control')) {
-    $roles = user_roles(1);
+    $roles = user_get_roles(TRUE);
     unset($roles[DRUPAL_AUTHENTICATED_RID]);  // Can't edit authenticated role.
 
     $add_roles = array();
@@ -2840,7 +2846,7 @@ function user_autocomplete($string = '')
 function user_filters() {
   // Regular filters
   $filters = array();
-  $roles = user_roles(1);
+  $roles = user_get_roles(TRUE);
   unset($roles[DRUPAL_AUTHENTICATED_RID]); // Don't list authorized role.
   if (count($roles)) {
     $filters['role'] = array(