Index: nodeasblock/nodeasblock.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodeasblock/nodeasblock.info,v
retrieving revision 1.1
diff -u -p -r1.1 nodeasblock.info
--- nodeasblock/nodeasblock.info	9 Nov 2006 18:47:37 -0000	1.1
+++ nodeasblock/nodeasblock.info	17 Jun 2008 16:59:29 -0000
@@ -1,3 +1,4 @@
 ; $Id: nodeasblock.info,v 1.1 2006/11/09 18:47:37 mfredrickson Exp $
 name = Node As Block
 description = Enables creation of blocks showing node teasers.
+core = 6.x
\ No newline at end of file
Index: nodeasblock/nodeasblock.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodeasblock/nodeasblock.install,v
retrieving revision 1.1.4.2
diff -u -p -r1.1.4.2 nodeasblock.install
--- nodeasblock/nodeasblock.install	27 May 2008 00:22:17 -0000	1.1.4.2
+++ nodeasblock/nodeasblock.install	17 Jun 2008 16:59:29 -0000
@@ -7,10 +7,7 @@
  * Install the database schema required.
  */
 function nodeasblock_install() {
-  db_query("CREATE TABLE {nodeasblock} (
-    nid int NOT NULL,
-    PRIMARY KEY  (nid)
-  )");
+  drupal_install_schema('nodeasblock');
 }
 
 /**
@@ -18,8 +15,24 @@ function nodeasblock_install() {
  * 
  * Remove the database schema, module variables and rehash the 'blocks' table.
  */
-function anodeasblock_uninstall() {
-  db_query('DROP TABLE {nodeasblock}');
+function nodeasblock_uninstall() {
+  drupal_uninstall_schema('nodeasblock');
   //@todo: delete module variables
 }
- 
\ No newline at end of file
+ 
+/**
+ * Implementation of hook_schema()
+ */
+function nodeasblock_schema() {
+  $schema['nodeasblock'] = array(
+    'description' => t('Stores node IDs to be displayed as blocks'),
+    'fields' => array(
+      'nid' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'description' => t('Primary Key: Node ID'),
+      ),
+    ),
+  );
+  return $schema;
+}
\ No newline at end of file
Index: nodeasblock/nodeasblock.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodeasblock/nodeasblock.module,v
retrieving revision 1.3.2.8
diff -u -p -r1.3.2.8 nodeasblock.module
--- nodeasblock/nodeasblock.module	26 May 2008 18:14:04 -0000	1.3.2.8
+++ nodeasblock/nodeasblock.module	17 Jun 2008 16:59:29 -0000
@@ -28,7 +28,7 @@ function nodeasblock_perm() {
 /**
  * Implementation of hook_form_alter().
  */
-function nodeasblock_form_alter($form_id, &$form) {
+function nodeasblock_form_alter(&$form, $form_state, $form_id) {
   if ($form_id == 'node_type_form' && isset($form['identity']['type'])) {
     _nodeasblock_content_type_form($form);
   }
@@ -40,9 +40,22 @@ function nodeasblock_form_alter($form_id
 }
 
 /**
+ * Implementation of hook_theme()
+ */
+function nodeasblock_theme() {
+  return array(
+    'nodeasblock' => array(
+      'arguments' => array('node' => NULL),
+    ),
+  );
+}
+
+/**
  * Helper function to provide the node form additions.
  */
 function _nodeasblock_node_form(&$form) {
+  global $theme;
+
   $node = $form['#node'];
   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));
@@ -106,7 +119,10 @@ function _nodeasblock_node_form(&$form) 
     );
     // Save title and reset after.
     $title = drupal_get_title();
-    $block_form = block_admin_configure('nodeasblock', $node->nid);
+    $form_state = array();
+    // load block admin functions
+    module_load_include('inc', 'block', 'block.admin');
+    $block_form = block_admin_configure($form_state, 'nodeasblock', $node->nid);
     drupal_set_title($title);
 
     foreach( array('block_settings', 'page_vis_settings') as $category) {
@@ -189,9 +205,9 @@ function _nodeasblock_content_type_form(
 function nodeasblock_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
   switch ($op) {
     case 'load':
-     $ret = db_query("SELECT nid FROM {nodeasblock} WHERE nid = $node->nid");
-     $output['nodeasblock'] = db_num_rows($ret);
-     return $output;
+      $ret = db_result(db_query("SELECT nid FROM {nodeasblock} WHERE nid = $node->nid"));
+      $output['nodeasblock'] = $ret ? 1 : 0;
+      return $output;
     case 'insert':
     case 'update':
       global $theme;