--- //192.168.1.26/web/html/modules/block/block.admin.inc.bak Tue Apr 27 13:56:56 2010 +++ //192.168.1.26/web/html/modules/block/block.admin.inc Tue Apr 27 13:58:07 2010 @@ -146,10 +146,13 @@ */ function block_admin_configure(&$form_state, $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(