Commit 3e1b4793 authored by Dries's avatar Dries

- Patch #953914 by chx, yched, pifantastic: #limit_validation_errors() fails...

- Patch #953914 by chx, yched, pifantastic: #limit_validation_errors() fails is parents array contains numeric indexes.
parent ead244e0
......@@ -1449,7 +1449,7 @@ function form_set_error($name = NULL, $message = '', $limit_validation_errors =
// so errors for this element must be recorded. As the exploded array
// will all be strings, we need to cast every value of the section
// array to string.
if (explode('][', $name, count($section)) === array_map('strval', $section)) {
if (array_slice(explode('][', $name), 0, count($section)) === array_map('strval', $section)) {
$record = TRUE;
break;
}
......
......@@ -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'));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment