Problem with blocks table

There are some ways to insert into blocks table many records with the same module and delta values but with different theme value. In code there are some sql queries which use only module and delta to select single record.

When there is more than one record with the same module and delta values, and you open configuration form for that block, data in form will be loaded randomly from any of those records.

I found that function block_admin_configure causes problems. SQL query in that function use only module and delta columns to select single record.

It is hardly/not understandable why a column has been called delta instead of some_id, and what columns belong to primary key in blocks table. I suppose that this is a reason of mistakes in sql queries. It is then supposed that there are more mistakes of that kind in blocks module.

I have attached simple patch that enables any configuration of blocks with the same module and delta values but different theme value.

--- block.module        (revision 1024)
+++ block.module        (working copy)
@@ -366,11 +366,14 @@
  * Menu callback; displays the block configuration form.
  */
 function block_admin_configure($module = NULL, $delta = 0) {
+  global $theme_key;

+  init_theme();
+
   $form['module'] = array('#type' => 'value', '#value' => $module);
   $form['delta'] = array('#type' => 'value', '#value' => $delta);

-  $edit = db_fetch_array(db_query("SELECT pages, visibility, custom, title FROM {blocks} WHERE module = '%s' AND delta = '%s'", $module, $delta));
+  $edit = db_fetch_array(db_query("SELECT pages, visibility, custom, title FROM {blocks} WHERE module = '%s' AND delta = '%s' AND theme = '%s'", $module, $delta, $theme_key));

   $form['block_settings'] = array(
     '#type' => 'fieldset',