block_admin_configure() not handling same block in different themes with different settings

I have a situation where I have the same block used in different themes and with different settings. If I look at the blocks database I see the correct information in there, but when I try to pull up the block configuration, the information is incorrect (from a different theme).

In looking at block_admin_configure() in block.admin.inc, there is the following select statement:
SELECT pages, visibility, custom, title FROM {blocks} WHERE module = '%s' AND delta = '%s'", $module, $delta

Because this statement does not also look for a theme, the wrong theme/modulename/delta combination may be chosen.

This is what the select statement should look like:
SELECT pages, visibility, custom, title FROM {blocks} WHERE module = '%s' AND delta = '%s' AND theme = '%s'", $module, $delta, $theme_key

The full patch is attached.

I realize this may be considered a duplicate of this issue: http://drupal.org/node/244871

However that issue is for Drupal 5.x and incorrectly states "It isn't an issue with D6..."