- Patch #583730 by sun: fixed form caching.

2 files changed, 5 insertions, 6 deletions

diff --git a/modules/book/book.module b/modules/book/book.module
index 08abba08a..9c0778b89 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -360,8 +360,7 @@ function book_get_books() {
  * @see book_pick_book_submit()
  * @see book_submit()
  */
-function book_form_alter(&$form, $form_state, $form_id) {
-
+function book_form_alter(&$form, &$form_state, $form_id) {
   if (!empty($form['#node_edit_form'])) {
     // Add elements to the node form.
     $node = $form['#node'];
@@ -375,7 +374,7 @@ function book_form_alter(&$form, $form_state, $form_id) {
     }
 
     if ($access) {
-      _book_add_form_elements($form, $node);
+      _book_add_form_elements($form, $form_state, $node);
       $form['book']['pick-book'] = array(
         '#type' => 'submit',
         '#value' => t('Change book (update list of parents)'),
@@ -439,9 +438,9 @@ function _book_parent_select($book_link) {
 /**
  * Build the common elements of the book form for the node and outline forms.
  */
-function _book_add_form_elements(&$form, $node) {
+function _book_add_form_elements(&$form, &$form_state, $node) {
   // Need this for AJAX.
-  $form['#cache'] = TRUE;
+  $form_state['cache'] = TRUE;
 
   $form['book'] = array(
     '#type' => 'fieldset',
diff --git a/modules/book/book.pages.inc b/modules/book/book.pages.inc
index 1e360ab8c..76454aa9f 100644
--- a/modules/book/book.pages.inc
+++ b/modules/book/book.pages.inc
@@ -117,7 +117,7 @@ function book_outline_form($form, &$form_state, $node) {
   }
   $form['#node'] = $node;
   $form['#id'] = 'book-outline';
-  _book_add_form_elements($form, $node);
+  _book_add_form_elements($form, $form_state, $node);
 
   $form['book']['#collapsible'] = FALSE;