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/trigger | |
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/trigger')
-rw-r--r-- | modules/trigger/trigger.admin.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/trigger/trigger.admin.inc b/modules/trigger/trigger.admin.inc index 2ab8cf764..5e4c3f408 100644 --- a/modules/trigger/trigger.admin.inc +++ b/modules/trigger/trigger.admin.inc @@ -46,7 +46,7 @@ function trigger_assign($type = NULL) { * @ingroup forms * @see trigger_unassign_submit() */ -function trigger_unassign($form_state, $hook = NULL, $op = NULL, $aid = NULL) { +function trigger_unassign($form, $form_state, $hook = NULL, $op = NULL, $aid = NULL) { if (!($hook && $op && $aid)) { drupal_goto('admin/structure/trigger/assign'); } @@ -114,7 +114,7 @@ function trigger_unassign_submit($form, &$form_state) { * @see trigger_assign_form_validate() * @see trigger_assign_form_submit() */ -function trigger_assign_form($form_state, $hook, $op, $description) { +function trigger_assign_form($form, $form_state, $hook, $op, $description) { $form['hook'] = array( '#type' => 'hidden', '#value' => $hook, |