diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-09-18 00:12:48 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-09-18 00:12:48 +0000 |
| commit | df02fa3ca46e16974192de77580762188ad47f49 (patch) | |
| tree | 91b2354aae786d7b187028dbc61fb3893b04ae64 /modules/contact | |
| parent | e18feedfdb429e35173b85fc7182aadabee0a166 (diff) | |
| download | brdo-df02fa3ca46e16974192de77580762188ad47f49.tar.gz brdo-df02fa3ca46e16974192de77580762188ad47f49.tar.bz2 | |
#571086 by sun and merlinofchaos: Added a 'wrapper callback' that executes
before a form builder function, to facilitate common form elements. Clean-up
from form_builder changes from CTools patch. Has nice side-benefit of making
all form functions' signatures consistent.
Diffstat (limited to 'modules/contact')
| -rw-r--r-- | modules/contact/contact.admin.inc | 4 | ||||
| -rw-r--r-- | modules/contact/contact.pages.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/contact/contact.admin.inc b/modules/contact/contact.admin.inc index 04e9f57b5..dd05b866c 100644 --- a/modules/contact/contact.admin.inc +++ b/modules/contact/contact.admin.inc @@ -39,7 +39,7 @@ function contact_admin_categories() { /** * Category edit page. */ -function contact_admin_edit($form_state = array(), $op, $contact = NULL) { +function contact_admin_edit($form, $form_state = array(), $op, $contact = NULL) { if (empty($contact) || $op == 'add') { $contact = array( @@ -138,7 +138,7 @@ function contact_admin_edit_submit($form, &$form_state) { /** * Category delete page. */ -function contact_admin_delete(&$form_state, $contact) { +function contact_admin_delete($form, &$form_state, $contact) { $form['contact'] = array( '#type' => 'value', diff --git a/modules/contact/contact.pages.inc b/modules/contact/contact.pages.inc index 93b534ee7..4c9210576 100644 --- a/modules/contact/contact.pages.inc +++ b/modules/contact/contact.pages.inc @@ -171,7 +171,7 @@ function contact_personal_page($account) { /** * Form builder; the personal contact form. */ -function contact_personal_form(&$form_state, $recipient) { +function contact_personal_form($form, &$form_state, $recipient) { global $user; $form['#token'] = $user->name . $user->mail; $form['recipient'] = array('#type' => 'value', '#value' => $recipient); |