summaryrefslogtreecommitdiff
path: root/modules/block/block.admin.inc
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-04-23 05:39:43 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-04-23 05:39:43 +0000
commit3622e5f7a83bc70229d8e2d71473032c5cf4823b (patch)
treec74c2a1ee8ee74b32f83495809fe5d3f46dcafaa /modules/block/block.admin.inc
parent9d746ed4508add0b23b167baee6c345485e4382b (diff)
downloadbrdo-3622e5f7a83bc70229d8e2d71473032c5cf4823b.tar.gz
brdo-3622e5f7a83bc70229d8e2d71473032c5cf4823b.tar.bz2
#316136 by pwolanin, David_Rothstein, coltrane, Heine: Fixed role name not filtered on admin/user/permissions.
Diffstat (limited to 'modules/block/block.admin.inc')
-rw-r--r--modules/block/block.admin.inc2
1 files changed, 1 insertions, 1 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'),