diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-11-02 03:27:20 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-11-02 03:27:20 +0000 |
| commit | 5074865e73ebb2485dd2933496dbe8ebcd741649 (patch) | |
| tree | beb985aab184693c9e80bb686a2a7278c8d9fa46 /modules | |
| parent | 0d371742b6498de344c35378c19238b13ef13b26 (diff) | |
| download | brdo-5074865e73ebb2485dd2933496dbe8ebcd741649.tar.gz brdo-5074865e73ebb2485dd2933496dbe8ebcd741649.tar.bz2 | |
#211015 by sun: Check for an existing #theme property for confirm_form() before clobbering it.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/system/system.module | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/system/system.module b/modules/system/system.module index 981284d4e..4b69e964b 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -2542,7 +2542,10 @@ function confirm_form($form, $question, $path, $description = NULL, $yes = NULL, $form['actions'] = array('#prefix' => '<div class="container-inline">', '#suffix' => '</div>'); $form['actions']['submit'] = array('#type' => 'submit', '#value' => $yes ? $yes : t('Confirm')); $form['actions']['cancel'] = array('#markup' => $cancel); - $form['#theme'] = 'confirm_form'; + // By default, render the form using theme_confirm_form(). + if (!isset($form['#theme'])) { + $form['#theme'] = 'confirm_form'; + } return $form; } |