From d048681f03b495256dbd52672a2a6e717425a5b0 Mon Sep 17 00:00:00 2001 From: Neil Drumm Date: Sun, 2 Jul 2006 20:24:17 +0000 Subject: #63990 by Heine and chx, allow commenting on nodes containing forms --- includes/form.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'includes') diff --git a/includes/form.inc b/includes/form.inc index 79c587bcf..55910c175 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -60,6 +60,11 @@ function element_children($element) { */ function drupal_get_form($form_id, &$form, $callback = NULL) { global $form_values, $form_submitted, $user, $form_button_counter; + static $saved_globals = array(); + + // Save globals in case of indirect recursive call + array_push($saved_globals, array($form_values, $form_submitted, $form_button_counter)); + $form_values = array(); $form_submitted = FALSE; $form_button_counter = array(0, 0); @@ -155,7 +160,10 @@ function drupal_get_form($form_id, &$form, $callback = NULL) { } } - return form_render($form); + $output = form_render($form); + // Restore globals + list($form_values, $form_submitted, $form_button_counter) = array_pop($saved_globals); + return $output; } function drupal_validate_form($form_id, $form, $callback = NULL) { -- cgit v1.2.3