diff options
| author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-07-04 08:52:55 +0000 |
|---|---|---|
| committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-07-04 08:52:55 +0000 |
| commit | c21db64ae8f965f28342b6cf528d180a057c6412 (patch) | |
| tree | a225ce35f648524839a9529966849c36089071f7 | |
| parent | 8d70d932b18372d178e7234109b5c086e9faffa9 (diff) | |
| download | brdo-c21db64ae8f965f28342b6cf528d180a057c6412.tar.gz brdo-c21db64ae8f965f28342b6cf528d180a057c6412.tar.bz2 | |
#69403 by webchick, adoid overriding #theme set by hook_form_alter().
| -rw-r--r-- | includes/form.inc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/includes/form.inc b/includes/form.inc index 55910c175..cd2e5b9eb 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -145,11 +145,14 @@ function drupal_get_form($form_id, &$form, $callback = NULL) { } } - if (theme_get_function($form_id)) { - $form['#theme'] = $form_id; - } - elseif (theme_get_function($callback)) { - $form['#theme'] = $callback; + // Don't override #theme if someone already set it. + if (!isset($form['#theme'])) { + if (theme_get_function($form_id)) { + $form['#theme'] = $form_id; + } + elseif (theme_get_function($callback)) { + $form['#theme'] = $callback; + } } if (isset($form['#pre_render'])) { |