Index: node_convert.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/node_convert/node_convert.module,v
retrieving revision 1.1.2.4.2.8
diff -u -p -r1.1.2.4.2.8 node_convert.module
--- node_convert.module	13 Dec 2009 15:06:08 -0000	1.1.2.4.2.8
+++ node_convert.module	24 May 2010 15:10:24 -0000
@@ -826,7 +826,7 @@ function hook_node_convert_change($data,
  *   TRUE if user can make conversions using this type, FALSE otherwise.
  */
 function node_convert_check_access($node) {
-  $access = user_access('convert from '. $node->type) && user_access('administer conversion');
+  $access = (user_access('administer conversion') || user_access('convert from '. $node->type)) ? TRUE : FALSE;
   return $access;
 }
 
@@ -843,7 +843,7 @@ function node_convert_return_access_node
   $list = array();
   $types = node_get_types();
   foreach ($types as $type => $parameters) {
-    if (user_access('convert '. $direction .' '. $type)) $list[$type] = $parameters->name;
+    if ((user_access('administer conversion')) || (user_access('convert '. $direction .' '. $type))) $list[$type] = $parameters->name;
   }
   if (!empty($list))
     return $list;
@@ -918,9 +918,14 @@ function node_convert_check_template_per
   elseif (!empty($data['template_id'])) {
     $template = node_convert_load_template($data['template_id']);
   }
-  else
+  else {
     return FALSE;
-
+  }
+  // user with this permission can convert from/to any content type
+  if (user_access('administer conversion')) {
+      return TRUE;
+  }
+  
   $access = user_access('convert from '. $template['source_type']) && user_access('convert to '. $template['destination_type']);
   return $access;
 }
@@ -956,4 +961,4 @@ function node_convert_convert_nodes_usin
       node_convert_messages($result, array('nid' => $nid));
     }
   }
-}
\ No newline at end of file
+}
