diff options
| author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-10-31 08:06:18 +0000 |
|---|---|---|
| committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-10-31 08:06:18 +0000 |
| commit | 0accf8fe1eb6c27fbc86c03b97f79043a5cbc38d (patch) | |
| tree | 8ab53c2078993eabed54f16cc5480ec64ccdcaab /modules | |
| parent | 2c2f33e60bac420e99232995a4e8a2e7d1f8b349 (diff) | |
| download | brdo-0accf8fe1eb6c27fbc86c03b97f79043a5cbc38d.tar.gz brdo-0accf8fe1eb6c27fbc86c03b97f79043a5cbc38d.tar.bz2 | |
#90508 by Heine and the security team. Every form gets a token.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/block/block.module | 8 | ||||
| -rw-r--r-- | modules/system/system.module | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/modules/block/block.module b/modules/block/block.module index bea866901..c7e9b1adf 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -315,7 +315,7 @@ function theme_block_admin_display($form) { $last_region = ''; $last_status = 1; foreach (element_children($form) as $i) { - $block = $form[$i]; + $block = &$form[$i]; // Only take form elements that are blocks. if (is_array($block['info'])) { // Fetch values @@ -358,10 +358,8 @@ function theme_block_admin_display($form) { $header[] = array('data' => t('Operations'), 'colspan' => 2); $output = theme('table', $header, $rows, array('id' => 'blocks')); - $output .= drupal_render($form['submit']); - // Also render the form_id as there is no drupal_render($form) call (as drupal_render does not appear to handle the - // multi-dimensional block form array very well). - $output .= drupal_render($form['form_id']); + + $output .= drupal_render($form); return $output; } diff --git a/modules/system/system.module b/modules/system/system.module index a88a80912..2705043f3 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -90,6 +90,7 @@ function system_elements() { $type['value'] = array('#input' => TRUE); $type['markup'] = array('#prefix' => '', '#suffix' => ''); $type['fieldset'] = array('#collapsible' => FALSE, '#collapsed' => FALSE); + $type['token'] = array('#input'=> TRUE); return $type; } |