diff options
| -rw-r--r-- | modules/block/block.admin.inc | 2 | ||||
| -rw-r--r-- | modules/filter/filter.admin.inc | 4 | ||||
| -rw-r--r-- | modules/user/user.admin.inc | 4 | ||||
| -rw-r--r-- | modules/user/user.module | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc index 0fcd119b1..1f5dab673 100644 --- a/modules/block/block.admin.inc +++ b/modules/block/block.admin.inc @@ -313,7 +313,7 @@ function block_admin_configure($form, &$form_state, $module, $delta) { ':module' => $block->module, ':delta' => $block->delta, ))->fetchCol(); - $role_options = db_query('SELECT rid, name FROM {role} ORDER BY name')->fetchAllKeyed(); + $role_options = array_map('check_plain', user_roles()); $form['visibility']['role'] = array( '#type' => 'fieldset', '#title' => t('Roles'), diff --git a/modules/filter/filter.admin.inc b/modules/filter/filter.admin.inc index 5e6254c72..aa07dcab4 100644 --- a/modules/filter/filter.admin.inc +++ b/modules/filter/filter.admin.inc @@ -28,7 +28,7 @@ function filter_admin_overview($form) { } else { $form['formats'][$id]['name'] = array('#markup' => check_plain($format->name)); - $roles = filter_get_roles_by_format($format); + $roles = array_map('check_plain', filter_get_roles_by_format($format)); $roles_markup = $roles ? implode(', ', $roles) : t('No roles may use this format'); } $form['formats'][$id]['roles'] = array('#markup' => $roles_markup); @@ -127,7 +127,7 @@ function filter_admin_format_form($form, &$form_state, $format) { $form['roles'] = array( '#type' => 'checkboxes', '#title' => t('Roles'), - '#options' => user_roles(), + '#options' => array_map('check_plain', user_roles()), '#disabled' => $is_fallback, ); if ($is_fallback) { diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc index ee100630c..7d92b7484 100644 --- a/modules/user/user.admin.inc +++ b/modules/user/user.admin.inc @@ -188,7 +188,7 @@ function user_admin_account() { $destination = drupal_get_destination(); $status = array(t('blocked'), t('active')); - $roles = user_roles(TRUE); + $roles = array_map('check_plain', user_roles(TRUE)); $accounts = array(); foreach ($result as $account) { $users_roles = array(); @@ -705,7 +705,7 @@ function user_admin_permissions($form, $form_state, $rid = NULL) { // Have to build checkboxes here after checkbox arrays are built foreach ($role_names as $rid => $name) { $form['checkboxes'][$rid] = array('#type' => 'checkboxes', '#options' => $options, '#default_value' => isset($status[$rid]) ? $status[$rid] : array()); - $form['role_names'][$rid] = array('#markup' => $name, '#tree' => TRUE); + $form['role_names'][$rid] = array('#markup' => check_plain($name), '#tree' => TRUE); } $form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions'))); diff --git a/modules/user/user.module b/modules/user/user.module index 2d23929bd..063704054 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -975,7 +975,7 @@ function user_account_form(&$form, &$form_state) { '#access' => $admin, ); - $roles = user_roles(TRUE); + $roles = array_map('check_plain', user_roles(TRUE)); // The disabled checkbox subelement for the 'authenticated user' role // must be generated separately and added to the checkboxes element, // because of a limitation in Form API not supporting a single disabled |