Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.434
diff -u -p -r1.434 aggregator.module
--- modules/aggregator/aggregator.module	13 Jan 2010 14:35:41 -0000	1.434
+++ modules/aggregator/aggregator.module	20 Jan 2010 20:44:30 -0000
@@ -358,7 +358,7 @@ function aggregator_block_info() {
 /**
  * Implements hook_block_configure().
  */
-function aggregator_block_configure($delta = '') {
+function aggregator_block_configure(&$form_state, $delta = '') {
   list($type, $id) = explode('-', $delta);
   if ($type == 'category') {
     $value = db_query('SELECT block FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $id))->fetchField();
Index: modules/block/block.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v
retrieving revision 1.72
diff -u -p -r1.72 block.admin.inc
--- modules/block/block.admin.inc	15 Jan 2010 10:59:21 -0000	1.72
+++ modules/block/block.admin.inc	20 Jan 2010 20:44:31 -0000
@@ -210,7 +210,7 @@ function block_admin_configure($form, &$
   );
 
   // Module-specific block configuration.
-  if ($settings = module_invoke($block->module, 'block_configure', $block->delta)) {
+  if ($settings = module_invoke($block->module, 'block_configure', $form_state, $block->delta)) {
     foreach ($settings as $k => $v) {
       $form['settings'][$k] = $v;
     }
Index: modules/block/block.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.api.php,v
retrieving revision 1.9
diff -u -p -r1.9 block.api.php
--- modules/block/block.api.php	17 Oct 2009 05:50:28 -0000	1.9
+++ modules/block/block.api.php	20 Jan 2010 20:44:31 -0000
@@ -72,6 +72,9 @@ function hook_block_info() {
 /**
  * Configuration form for the block.
  *
+ * @param &$form_state
+ *   The current form state. Required for AHAH callbacks to function
+ *   properly.
  * @param $delta
  *   Which block to return. This is a descriptive string used to identify
  *   blocks within each module and also within the theme system.
@@ -82,7 +85,7 @@ function hook_block_info() {
  *
  * For a detailed usage example, see block_example.module.
  */
-function hook_block_configure($delta = '') {
+function hook_block_configure(&$form_state, $delta = '') {
   if ($delta == 'exciting') {
     $form['items'] = array(
       '#type' => 'select',
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.407
diff -u -p -r1.407 block.module
--- modules/block/block.module	13 Jan 2010 05:40:03 -0000	1.407
+++ modules/block/block.module	20 Jan 2010 20:44:32 -0000
@@ -183,7 +183,7 @@ function block_block_info() {
 /**
  * Implements hook_block_configure().
  */
-function block_block_configure($delta = 0) {
+function block_block_configure(&$form_state, $delta = 0) {
   $custom_block = array('format' => filter_default_format());
   if ($delta) {
     $custom_block = block_custom_block_get($delta);
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.536
diff -u -p -r1.536 book.module
--- modules/book/book.module	9 Jan 2010 21:54:00 -0000	1.536
+++ modules/book/book.module	20 Jan 2010 20:44:34 -0000
@@ -310,7 +310,7 @@ function book_block_view($delta = '') {
 /**
  * Implements hook_block_configure().
  */
-function book_block_configure($delta = '') {
+function book_block_configure(&$form_state, $delta = '') {
   $block = array();
   $options = array(
     'all pages' => t('Show block on all pages'),
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.837
diff -u -p -r1.837 comment.module
--- modules/comment/comment.module	14 Jan 2010 02:00:08 -0000	1.837
+++ modules/comment/comment.module	20 Jan 2010 20:44:37 -0000
@@ -344,7 +344,7 @@ function comment_block_info() {
 /**
  * Implements hook_block_configure().
  */
-function comment_block_configure($delta = '') {
+function comment_block_configure(&$form_state, $delta = '') {
   $form['comment_block_count'] = array(
     '#type' => 'select',
     '#title' => t('Number of recent comments'),
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.553
diff -u -p -r1.553 forum.module
--- modules/forum/forum.module	14 Jan 2010 06:20:15 -0000	1.553
+++ modules/forum/forum.module	20 Jan 2010 20:44:39 -0000
@@ -599,7 +599,7 @@ function forum_block_info() {
 /**
  * Implements hook_block_configure().
  */
-function forum_block_configure($delta = '') {
+function forum_block_configure(&$form_state, $delta = '') {
   $form['forum_block_num_' . $delta] = array('#type' => 'select', '#title' => t('Number of topics'), '#default_value' => variable_get('forum_block_num_' . $delta, '5'), '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)));
   return $form;
 }
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1218
diff -u -p -r1.1218 node.module
--- modules/node/node.module	20 Jan 2010 17:11:52 -0000	1.1218
+++ modules/node/node.module	20 Jan 2010 20:44:43 -0000
@@ -2075,7 +2075,7 @@ function node_block_view($delta = '') {
 /**
  * Implements hook_block_configure().
  */
-function node_block_configure($delta = '') {
+function node_block_configure(&$form_state, $delta = '') {
   $form = array();
   if ($delta == 'recent') {
     $form['node_recent_block_count'] = array(
Index: modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.287
diff -u -p -r1.287 profile.module
--- modules/profile/profile.module	13 Jan 2010 14:01:34 -0000	1.287
+++ modules/profile/profile.module	20 Jan 2010 20:44:44 -0000
@@ -146,7 +146,7 @@ function profile_menu() {
 /**
  * Implements hook_block_configure().
  */
-function profile_block_configure($delta = '') {
+function profile_block_configure(&$form_state, $delta = '') {
   // Compile a list of fields to show
   $fields = array();
   $result = db_query('SELECT name, title, weight, visibility FROM {profile_field} WHERE visibility IN (:visibility) ORDER BY weight', array(':visibility' => array(PROFILE_PUBLIC, PROFILE_PUBLIC_LISTINGS)));
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.330
diff -u -p -r1.330 statistics.module
--- modules/statistics/statistics.module	8 Jan 2010 07:36:53 -0000	1.330
+++ modules/statistics/statistics.module	20 Jan 2010 20:44:45 -0000
@@ -311,7 +311,7 @@ function statistics_block_info() {
 /**
  * Implements hook_block_configure().
  */
-function statistics_block_configure($delta = '') {
+function statistics_block_configure(&$form_state, $delta = '') {
   // Popular content block settings
   $numbers = array('0' => t('Disabled')) + drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40));
   $form['statistics_block_top_day_num'] = array('#type' => 'select', '#title' => t("Number of day's top views to display"), '#default_value' => variable_get('statistics_block_top_day_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "day" list.'));
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1112
diff -u -p -r1.1112 user.module
--- modules/user/user.module	14 Jan 2010 19:21:55 -0000	1.1112
+++ modules/user/user.module	20 Jan 2010 20:44:50 -0000
@@ -1171,7 +1171,7 @@ function user_block_info() {
 /**
  * Implements hook_block_configure().
  */
-function user_block_configure($delta = '') {
+function user_block_configure(&$form_state, $delta = '') {
   global $user;
 
   switch ($delta) {