commit d0f1f28e1fa46222e177cb4e5d88dd9047e0115b Author: Joel Pittet Date: Thu Feb 27 01:59:58 2014 -0800 leave clobber diff --git a/core/includes/form.inc b/core/includes/form.inc index 825f075..f9ca778 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -1134,10 +1134,10 @@ function form_pre_render_radio($element) { */ function template_preprocess_radios(&$variables) { $element = $variables['element']; + $variables['attributes'] = array(); if (isset($element['#id'])) { $variables['attributes']['id'] = $element['#id']; } - $variables['attributes']['class'] = array(); $variables['attributes']['class'][] = 'form-radios'; if (!empty($element['#attributes']['class'])) { $variables['attributes']['class'] = array_merge($variables['attributes']['class'], $element['#attributes']['class']); @@ -1146,9 +1146,6 @@ function template_preprocess_radios(&$variables) { $variables['attributes']['title'] = $element['#attributes']['title']; } $variables['children'] = $element['#children']; - - // Remove the disabled attibute on the wrapper. - unset($variables['attributes']['disabled']); } /** diff --git a/core/modules/system/templates/radios.html.twig b/core/modules/system/templates/radios.html.twig index 9058739..e397644 100644 --- a/core/modules/system/templates/radios.html.twig +++ b/core/modules/system/templates/radios.html.twig @@ -11,7 +11,5 @@ * * @ingroup themeable */ - @todo: remove this file once http://drupal.org/node/1819284 is resolved. - This is identical to core/modules/system/templates/container.html.twig #} {{ children }}