? .clone.pages.inc.swp
Index: clone.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/node_clone/clone.module,v
retrieving revision 1.23.2.2
diff -u -r1.23.2.2 clone.module
--- clone.module	30 Sep 2010 00:59:15 -0000	1.23.2.2
+++ clone.module	1 Dec 2010 15:17:12 -0000
@@ -54,10 +54,8 @@
   global $user;
   // Check basic permissions first.
   $access = clone_is_permitted($node->type) && (user_access('clone node') || ($user->uid && ($node->uid == $user->uid) && user_access('clone own nodes')));
-  // Check additional conditions
-  $access = $access && (filter_access($node->format) && node_access('create', $node->type));
-  // Make sure the user can view the original node content.
-  $access = $access && node_access('view', $node);
+  // Make sure the user can view the original node content, and create a new one..
+  $access = $access && node_access('view', $node) && node_access('create', $node->type);
   // Let other modules alter this - for exmple to only allow some users
   // to clone specific nodes or types.
   drupal_alter("clone_access", $access, $node);
Index: clone.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/node_clone/clone.pages.inc,v
retrieving revision 1.3.2.3
diff -u -r1.3.2.3 clone.pages.inc
--- clone.pages.inc	30 Sep 2010 00:59:15 -0000	1.3.2.3
+++ clone.pages.inc	1 Dec 2010 15:17:12 -0000
@@ -35,7 +35,7 @@
     '#type' => 'fieldset',
     '#title' => t('Should the publishing options ( e.g. published, promoted, etc) be reset to the defaults?'),
   );
-  $types = node_get_types('names');
+  $types = node_type_get_names();
 
   foreach ($types as $type => $name) {
     $form['publishing']['clone_reset_'. $type] = array(
@@ -138,7 +138,7 @@
     global $user;
 
     if (clone_is_permitted($original_node->type)) {
-      $node = drupal_clone($original_node);
+      $node = clone $original_node;
 
       $node->nid = NULL;
       $node->vid = NULL;
@@ -167,7 +167,7 @@
       // Let other modules do special fixing up.
       // The function signature is: hook_clone_node_alter(&$node, $original_node, $method)
       // Where $method is either 'prepopulate' or 'save-edit'.
-      drupal_alter("clone_node", $node, $original_node, "prepopulate");
+      drupal_alter("clone_node_prepopulate", $node, $original_node);
       // Make sure the file defining the node form is loaded.
       module_load_include('inc', 'node', 'node.pages');
       return drupal_get_form($node->type .'_node_form', $node);
@@ -184,7 +184,7 @@
 
     $node = node_load($nid);
     if (isset($node->nid) && clone_is_permitted($node->type)) {
-      $original_node = drupal_clone($node);
+      $original_node = clone $node;
 
       $node->nid = NULL;
       $node->vid = NULL;
@@ -210,7 +210,7 @@
       // Let other modules do special fixing up.
       // The function signature is: hook_clone_node_alter(&$node, $original_node, $method)
       // Where $method is either 'prepopulate' or 'save-edit'.
-      drupal_alter("clone_node", $node, $original_node, "save-edit");
+      drupal_alter("clone_node_save_edit", $node, $original_node);
 
       node_save($node);
       return $node->nid;