Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.265
diff -u -r1.265 block.module
--- modules/block/block.module	11 Jun 2007 07:46:05 -0000	1.265
+++ modules/block/block.module	18 Jun 2007 00:34:26 -0000
@@ -217,7 +217,7 @@
 /**
  * Generate main block administration form.
  */
-function block_admin_display($theme = NULL) {
+function block_admin_display(&$form_state, $theme = NULL) {
   global $theme_key, $custom_theme;
 
   // Add CSS
@@ -379,7 +379,7 @@
 /**
  * Menu callback; displays the block configuration form.
  */
-function block_admin_configure($module = NULL, $delta = 0) {
+function block_admin_configure(&$form_state, $module = NULL, $delta = 0) {
 
   $form['module'] = array('#type' => 'value', '#value' => $module);
   $form['delta'] = array('#type' => 'value', '#value' => $delta);
@@ -524,8 +524,8 @@
 /**
  * Menu callback: display the custom block addition form.
  */
-function block_add_block_form() {
-  return block_admin_configure('block', NULL);
+function block_add_block_form(&$form_state) {
+  return block_admin_configure($form_state, 'block', NULL);
 }
 
 function block_add_block_form_validate($form, &$form_state) {