Index: flexinode.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/flexinode/flexinode.module,v
retrieving revision 1.72
diff -u -r1.72 flexinode.module
--- flexinode.module	18 Apr 2006 19:37:20 -0000	1.72
+++ flexinode.module	19 Apr 2006 02:52:05 -0000
@@ -106,7 +106,7 @@
   if ($type == 'node' && strpos($node->type, 'flexinode-') === 0) {
     /* Don't display a redundant edit link if they are node administrators */
     if (flexinode_access('update', $node) && !user_access('administer nodes')) {
-      $links[] = l(t('edit this %nodename', array('%nodename' => flexinode_node_name($node->type))), 'node/'. $node->nid .'/edit');
+      $links[] = l(t('edit this %nodename', array('%nodename' => node_get_name($node))), 'node/'. $node->nid .'/edit');
     }
   }
 
@@ -447,10 +447,6 @@
   return $types;
 }
 
-function flexinode_node_name($type) {
-  $types = flexinode_node_info();
-  return $types[$type]['name'];
-}
 
 /**
  * Implementation of hook_access().
@@ -465,7 +461,7 @@
   }
 
   if ($op == 'create') {
-    return user_access('create '. flexinode_node_name($node->type) .' content');
+    return user_access('create '. node_get_name($node) .' content');
   }
 
   if ($op == 'update') {
@@ -477,10 +473,10 @@
   }
 
   if ($op == 'update' || $op == 'delete') {
-    if (user_access('edit any '. flexinode_node_name($node->type) .' content')) {
+    if (user_access('edit any '. node_get_name($node) .' content')) {
       return TRUE;
     }
-    elseif (user_access('edit own '. flexinode_node_name($node->type) .' content') && ($user->uid == $node->uid)) {
+    elseif (user_access('edit own '. node_get_name($node) .' content') && ($user->uid == $node->uid)) {
       return TRUE;
     }
   }