summaryrefslogtreecommitdiff
path: root/modules/contact
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-02-17 08:48:18 +0000
committerDries Buytaert <dries@buytaert.net>2010-02-17 08:48:18 +0000
commit21087fc9029d0c8d4dc2571130bdd46ce98a07d1 (patch)
treed08c3dd1ad628117780a83d0f7f82ff92a1fec8f /modules/contact
parent833ab255e92b5a8a1e9294282a4851c58d26a25f (diff)
downloadbrdo-21087fc9029d0c8d4dc2571130bdd46ce98a07d1.tar.gz
brdo-21087fc9029d0c8d4dc2571130bdd46ce98a07d1.tar.bz2
- Patch #716558 by Dave Reid: use ['actions'] in contact forms.
Diffstat (limited to 'modules/contact')
-rw-r--r--modules/contact/contact.admin.inc12
-rw-r--r--modules/contact/contact.pages.inc11
2 files changed, 19 insertions, 4 deletions
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'),
);