--- flexinode.module.old	2005-09-14 16:16:02.000000000 -0400
+++ flexinode.module	2005-09-21 21:12:46.000000000 -0400
@@ -521,7 +521,7 @@
   global $user;
   
   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') {
@@ -533,7 +533,7 @@
   }
 
   if ($op == 'update' || $op == 'delete') {
-    if (user_access('edit own '. flexinode_node_name($node->type) .' content') && ($user->uid == $node->uid)) {
+    if (user_access('edit own '. node_get_name($node) .' content') && ($user->uid == $node->uid)) {
       return TRUE;
     }
   }
@@ -1161,9 +1161,9 @@
       $entry = array('link' => url('node/'. $item), 
                     'type' => node_invoke($node, 'node_name'),
                     'title' => $node->title,
-                    'user' => format_name($node),
+                    'user' => theme('username',$node),
                     'date' => $node->changed,
-                    'snippet' =>search_excerpt($search, check_output($node->body, $node->format)));
+                    'snippet' =>search_excerpt($search, check_markup($node->body, $node->format)));
       $type = 'flexinode';
       $output .= theme('search_item', $entry, $type);
 
@@ -1180,7 +1180,7 @@
 
   watchdog('search', t('Search: %keys (%type).', array('%keys' => theme('placeholder', $keys), '%type' => node_invoke($node, 'node_name'))), WATCHDOG_NOTICE);
   
-  return theme('page', $again . $output);
+  return $again . $output;
 }
 
 function flexinode_feed($ctype_id = NULL) {