Index: views.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/views.module,v
retrieving revision 1.300
diff -u -F^[^a-z]*function -r1.300 views.module
--- views.module	25 Jun 2008 21:10:10 -0000	1.300
+++ views.module	12 Aug 2008 13:43:07 -0000
@@ -90,6 +90,23 @@ function views_theme() {
   return $hooks;
 }
 
+/**
+ * A theme preprocess function to automatically allow view-based node
+ * templates if called from a view.
+ *
+ * The 'modules/node.views.inc' file is a better place for this, but
+ * we haven't got a chance to load that file before Drupal builds the
+ * node portion of the theme registry.
+ *
+ * @todo Remove this in Drupal 7, as it has a code registry.
+ */
+function views_preprocess_node(&$vars) {
+  // The 'view' attribute of the node is added in template_preprocess_views_view_row_node()
+  if (!empty($vars['node']->view) && !empty($vars['node']->view->name)) {
+    $vars['template_files'][] = 'node-view-' . $vars['node']->view->name;
+  }
+}
+
 /*
  * Implementation of hook_perm()
  */
Index: modules/node.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/node.views.inc,v
retrieving revision 1.77
diff -u -F^[^a-z]*function -r1.77 node.views.inc
--- modules/node.views.inc	9 Jul 2008 18:31:26 -0000	1.77
+++ modules/node.views.inc	12 Aug 2008 13:43:10 -0000
@@ -1218,6 +1218,9 @@   function options_form(&$form, &$form_s
 
 /**
  * Template helper for theme_views_view_row_node
+ *
+ * Also, see views_preprocess_node(), which was placed in 'views.module' 
+ * because of limitations of the theming system.
  */
 function template_preprocess_views_view_row_node(&$vars) {
   $options = $vars['options'];
@@ -1228,6 +1231,7 @@ function template_preprocess_views_view_
   }
 
   $node = node_load($nid);
+  // The following attribute is utilized in views_preprocess_node().
   $node->view = $vars['view'];
 
   if (empty($node)) {
@@ -1242,15 +1246,6 @@ function template_preprocess_views_view_
 }
 
 /**
- * Automatically allow view-based node templates if called from a view.
- */
-function views_preprocess_node(&$vars) {
-  if (!empty($vars['node']->view) && !empty($vars['node']->view->name)) {
-    $vars['template_files'][] = 'node-view-' . $vars['node']->view->name;
-  }
-}
-
-/**
  * Plugin which performs a node_view on the resulting object
  * and formats it as an RSS item.
  */