Index: block_class.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/block_class/block_class.module,v
retrieving revision 1.3.4.2
diff -u -p -r1.3.4.2 block_class.module
--- block_class.module	3 Jun 2009 12:21:45 -0000	1.3.4.2
+++ block_class.module	3 Jun 2009 12:43:44 -0000
@@ -14,7 +14,7 @@ function block_class_attributes($block) 
 
 
 function block_class_form_alter(&$form, &$form_state, $form_id) {
-  if ($form_id == 'block_admin_configure') {
+  if ($form_id == 'block_admin_configure' || $form_id == 'block_add_block_form') {
     $block->module = $form['module']['#value'];
     $block->delta = $form['delta']['#value'];
     $attributes = block_class_attributes($block);
@@ -31,17 +31,17 @@ function block_class_form_alter(&$form, 
       '#default_value' => $attributes->css_class,
       '#description' => t('Separate classes with a space. IMPORTANT: You must add <?php print block_class($block); ?> to your theme\'s block.tpl.php file to make the classes appear.'),
     );
-    
-   $form['#validate'][] = 'block_class_validate';
+
+    $form['#submit'][] = 'block_class_form_submit';
   }
 }
 
 
-function block_class_validate($form, &$form_state) {
-  if ($form_state['values']['form_id'] == 'block_admin_configure') {
+function block_class_form_submit($form, &$form_state) {
+  if ($form_state['values']['form_id'] == 'block_admin_configure' || $form_state['values']['form_id'] == 'block_add_block_form') {
     if (isset($form_state['values']['css_class']) && user_access('administer blocks')) {
-      $module = arg(4);
-      $delta = arg(5);
+      $module = $form_state['values']['module'];
+      $delta = $form_state['values']['delta'];
       $class = $form_state['values']['css_class'];
   
       db_query('DELETE FROM {block_class} WHERE module = "%s" AND delta = "%s"', $module, $delta);
@@ -51,8 +51,6 @@ function block_class_validate($form, &$f
       }
     }
   }
-
-  block_admin_configure_validate($form, $form_state);
 }