? .cvsignore
? 743872.patch
Index: nd.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nd/nd.module,v
retrieving revision 1.1.2.123.2.39
diff -u -p -r1.1.2.123.2.39 nd.module
--- nd.module	24 Mar 2010 14:51:12 -0000	1.1.2.123.2.39
+++ nd.module	29 Mar 2010 10:21:52 -0000
@@ -198,18 +198,17 @@ function _nd_preprocess_node(&$vars, $ho
 
   $node = $vars['node'];
 
+  // Break all the rendering if needed.
+  if (!$node->render_by_ds) {
+    return;
+  }
+
   // Add nd-content_type-build_mode(-nid) template suggestion.
   $vars['template_files'][] = 'nd';
   $vars['template_files'][] = 'nd-'. $node->type;
   $vars['template_files'][] = 'nd-'. $node->type .'-'. $node->build_mode;
   $vars['template_files'][] = 'nd-'. $node->type .'-'. $node->build_mode .'-'. $node->nid;
 
-  // Break all the rendering if needed.
-  if (!$node->render_by_ds) {
-    $vars['template_files'][] = 'node';
-    return;
-  }
-
   $content = ds_render_content($node, 'nd', $vars);
   $vars['content'] = $content;
 }