From 45f4a1e166d090e23cb385c3238835fce61d1607 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 24 Apr 2010 14:49:14 +0000
Subject: - Patch #482816 by sun, Rob Loach: make a consistent wrapper around
 submit buttons.

---
 modules/system/system.module | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'modules/system/system.module')

diff --git a/modules/system/system.module b/modules/system/system.module
index 1e526fcb0..a33807dfd 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -472,6 +472,11 @@ function system_element_info() {
     '#theme_wrappers' => array('container'),
     '#process' => array('form_process_container'),
   );
+  $types['actions'] = array(
+    '#theme_wrappers' => array('container'),
+    '#process' => array('form_process_actions', 'form_process_container'),
+    '#weight' => 100,
+  );
 
   $types['token'] = array(
     '#input' => TRUE,
@@ -2575,9 +2580,7 @@ function _system_settings_form_automatic_defaults($form) {
  * @ingroup forms
  */
 function system_settings_form($form, $automatic_defaults = TRUE) {
-  $form['actions']['#type'] = 'container';
-  $form['actions']['#attributes']['class'][] = 'form-actions';
-  $form['actions']['#weight'] = 100;
+  $form['actions']['#type'] = 'actions';
   $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
 
   if ($automatic_defaults) {
@@ -2690,8 +2693,8 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL,
   $form[$name] = array('#type' => 'hidden', '#value' => 1);
 
   $form['actions'] = array(
-    '#type' => 'container',
-    '#attributes' => array('class' => array('form-actions', 'container-inline')),
+    '#type' => 'actions',
+    '#attributes' => array('class' => array('container-inline')),
   );
   $form['actions']['submit'] = array('#type' => 'submit', '#value' => $yes ? $yes : t('Confirm'));
   $form['actions']['cancel'] = array('#markup' => $cancel);
-- 
cgit v1.2.3