summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-11-17 04:10:52 +0000
committerDries Buytaert <dries@buytaert.net>2010-11-17 04:10:52 +0000
commit3e1b4793a205f5ee44ab03395a9379ad22a80cb5 (patch)
treefe9b2adbf78efef2c4ff2c54db3e4a67560f822c /modules
parentead244e09ff7751a03e8cefbab3e77e69b7117c0 (diff)
downloadbrdo-3e1b4793a205f5ee44ab03395a9379ad22a80cb5.tar.gz
brdo-3e1b4793a205f5ee44ab03395a9379ad22a80cb5.tar.bz2
- Patch #953914 by chx, yched, pifantastic: #limit_validation_errors() fails is parents array contains numeric indexes.
Diffstat (limited to 'modules')
-rw-r--r--modules/user/user.admin.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 701a78885..123d0c1e0 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -767,7 +767,7 @@ function theme_user_admin_permissions($variables) {
'class' => array('permission'),
);
foreach (element_children($form['checkboxes']) as $rid) {
- $form['checkboxes'][$rid][$key]['#title'] = $roles[$rid] . ': ' . t($key);
+ $form['checkboxes'][$rid][$key]['#title'] = $roles[$rid] . ': ' . $form['permission'][$key]['#markup'];
$form['checkboxes'][$rid][$key]['#title_display'] = 'invisible';
$row[] = array('data' => drupal_render($form['checkboxes'][$rid][$key]), 'class' => array('checkbox'));
}