From 21087fc9029d0c8d4dc2571130bdd46ce98a07d1 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 17 Feb 2010 08:48:18 +0000
Subject: - Patch #716558 by Dave Reid: use ['actions'] in contact forms.

---
 modules/contact/contact.admin.inc | 12 ++++++++++--
 modules/contact/contact.pages.inc | 11 +++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'modules/contact')

diff --git a/modules/contact/contact.admin.inc b/modules/contact/contact.admin.inc
index 6677962a5..6d643c21e 100644
--- a/modules/contact/contact.admin.inc
+++ b/modules/contact/contact.admin.inc
@@ -39,7 +39,12 @@ function contact_category_list() {
     ));
   }
 
-  return theme('table', array('header' => $header, 'rows' => $rows));
+  $build['category_table'] = array(
+    '#theme' => 'table',
+    '#header' => $header,
+    '#rows' => $rows,
+  );
+  return $build;
 }
 
 /**
@@ -97,7 +102,10 @@ function contact_category_edit_form($form, &$form_state, array $category = array
     '#type' => 'value',
     '#value' => $category['cid'],
   );
-  $form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions')));
+  $form['actions'] = array(
+    '#type' => 'container',
+    '#attributes' => array('class' => array('form-actions')),
+  );
   $form['actions']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save'),
diff --git a/modules/contact/contact.pages.inc b/modules/contact/contact.pages.inc
index 9059749e9..dfe511069 100644
--- a/modules/contact/contact.pages.inc
+++ b/modules/contact/contact.pages.inc
@@ -101,7 +101,10 @@ function contact_site_form($form, &$form_state) {
     '#title' => t('Send yourself a copy.'),
     '#access' => $user->uid,
   );
-  $form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions')));
+  $form['actions'] = array(
+    '#type' => 'container',
+    '#attributes' => array('class' => array('form-actions')),
+  );
   $form['actions']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Send message'),
@@ -232,7 +235,11 @@ function contact_personal_form($form, &$form_state, $recipient) {
     '#title' => t('Send yourself a copy.'),
     '#access' => $user->uid,
   );
-  $form['submit'] = array(
+  $form['actions'] = array(
+    '#type' => 'container',
+    '#attributes' => array('class' => array('form-actions')),
+  );
+  $form['actions']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Send message'),
   );
-- 
cgit v1.2.3