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/book | |
| 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/book')
| -rw-r--r-- | modules/book/book.admin.inc | 3 | ||||
| -rw-r--r-- | modules/book/book.pages.inc | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/modules/book/book.admin.inc b/modules/book/book.admin.inc index 8af9b195c..d1745473a 100644 --- a/modules/book/book.admin.inc +++ b/modules/book/book.admin.inc @@ -77,9 +77,8 @@ function book_admin_settings_validate($form, &$form_state) { * * @ingroup forms. */ -function book_admin_edit($form_state, $node) { +function book_admin_edit($form, $form_state, $node) { drupal_set_title($node->title); - $form = array(); $form['#node'] = $node; _book_admin_table($node, $form); $form['save'] = array( diff --git a/modules/book/book.pages.inc b/modules/book/book.pages.inc index 3e139cd81..5909c5b58 100644 --- a/modules/book/book.pages.inc +++ b/modules/book/book.pages.inc @@ -102,7 +102,7 @@ function book_outline($node) { * * @ingroup forms */ -function book_outline_form(&$form_state, $node) { +function book_outline_form($form, &$form_state, $node) { if (!isset($node->book)) { // The node is not part of any book yet - set default options. $node->book = _book_link_defaults($node->nid); @@ -186,7 +186,7 @@ function book_outline_form_submit($form, &$form_state) { * * @ingroup forms */ -function book_remove_form(&$form_state, $node) { +function book_remove_form($form, &$form_state, $node) { $form['#node'] = $node; $title = array('%title' => $node->title); |