From fa27c1af1774064e3e1594cdc989357b28023d84 Mon Sep 17 00:00:00 2001 From: Adam Vessey Date: Wed, 5 Dec 2012 10:22:22 -0400 Subject: [PATCH] Revert "Allow form builders to trigger rebuilds." This reverts commit 7a0efc1230d0e6f37f051798b3afd78f0aee7b1d. ... Rebuilding is/was kinda broken. --- includes/ingest.form.inc | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/includes/ingest.form.inc b/includes/ingest.form.inc index 8db494a7..ad4fc308 100644 --- a/includes/ingest.form.inc +++ b/includes/ingest.form.inc @@ -32,21 +32,7 @@ */ function islandora_ingest_form(array $form, array &$form_state, array $configuration) { islandora_ingest_form_init_form_state($form_state, $configuration); - - $original_form = $form; - $form = islandora_ingest_form_execute_step($original_form, $form_state); - - // XXX: One would think that this would be handled by Drupal proper; however, - // it is not. To trigger rebuilds from inside of a form building function - // does not look to be provided for. - while ($form_state['rebuild'] === TRUE) { - $form_state['rebuild'] = FALSE; - // Might've changed the step... Might need to include new files. - islandora_ingest_form_step_form_load_include($form_state); - $form = islandora_ingest_form_execute_step($original_form, $form_state); - } - - return $form; + return islandora_ingest_form_execute_step($form, $form_state); } /**