Index: C:/Program Files/EasyPHP2/www-trunk/sites/all/modules/nodeasblock/nodeasblock.module
===================================================================
--- C:/Program Files/EasyPHP2/www-trunk/sites/all/modules/nodeasblock/nodeasblock.module	(revision 2193)
+++ C:/Program Files/EasyPHP2/www-trunk/sites/all/modules/nodeasblock/nodeasblock.module	(revision 2560)
@@ -25,7 +25,7 @@
     );
   }
   if (isset($form['type'])) {
-    global $theme;
+    global $theme,$theme_key;
     $node = $form['#node'];
     if ($form['type']['#value'] .'_node_form' == $form_id && variable_get("nodeasblock_$node->type", TRUE) && user_access('create blocks for nodes')) {
       $form['nodeasblockset'] = array (
@@ -43,11 +43,11 @@
     
       if (user_access('administer blocks')) {
         if ($node->nid) {
-          $block = db_fetch_array(db_query("SELECT * FROM {blocks} WHERE module = '%s' AND delta = '%s' AND theme = '%s'", 'nodeasblock', $node->nid, $theme));
+          $block = db_fetch_array(db_query("SELECT * FROM {blocks} WHERE module = '%s' AND delta = '%s' AND theme = '%s'", 'nodeasblock', $node->nid, $theme_key));
         }
         $form['nodeasblockset']['nodeasblock_region'] = array (
           '#type' => 'select',
-          '#options' => system_region_list($theme),
+          '#options' => system_region_list($theme_key),
           '#title' => t('Region'),
           '#default_value' => isset($block) ? $block['region'] : system_default_region($theme),
           '#description' => t('The region of the page this block should appear in.'),