--- disknode.module.orig	2006-05-10 03:01:59.612402900 +0200
+++ disknode.module	2006-05-17 19:02:00.767140700 +0200
@@ -107,11 +107,11 @@ function disknode_settings() {
     '#default_value' => variable_get('disknode_asnode', 0),
     '#description' => t('Act as a standalone node type. When you disable this you can convert old disknodes to an other node type using %link. <b>deprecated</b>', array("%link" => l(t("this form"), "disknode/convert"))),
   );
-  foreach (node_get_types() as $type) {
+  foreach (node_get_types() as $type => $name) {
     if ($type == 'disknode') continue;
     $form['_disknodebehavior']['disknode_node_'.$type] = array(
       '#type' => 'checkbox',
-      '#title' => t('Attach to %type', array("%type" => node_get_name($type))),
+      '#title' => t('Attach to %name', array("%name" => $name)),
       '#default_value' => variable_get('disknode_node_'.$type, 0),
       '#description' => t('Provide the disknode functionality to the node type %type.', array("%type" => $type)),
     );
@@ -430,11 +430,8 @@ function _disknode_convert() {
   drupal_set_title(t('Convert disknodes'));
   if (empty($_POST["edit"]["target_node"]) || empty($_POST["edit"]["iamsure"])) {
 
-    $nodelist = array();
-    foreach (node_get_types() as $type) {
-      if ($type == 'disknode') continue;
-      $nodelist[$type] = node_get_name($type);
-    }
+    $nodelist = node_get_types();
+    unset($nodelist['disknode']);
 
     $form['target_node'] = array(
       '#type' => 'select',