Index: views-attach-node-content-view.tpl.php
===================================================================
RCS file: views-attach-node-content-view.tpl.php
diff -N views-attach-node-content-view.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ views-attach-node-content-view.tpl.php	13 May 2009 05:43:02 -0000
@@ -0,0 +1,89 @@
+<?php
+// $Id$
+/**
+ * @file views-attach-node-content-view.tpl.php
+ * Node content view template
+ *
+ * Variables available:
+ * - $css_name: A css-safe version of the view name.
+ * - $title: The title of the view
+ * - $header: The view header
+ * - $footer: The view footer
+ * - $rows: The results of the view query, if any
+ * - $empty: The empty text to display if the view is empty
+ * - $pager: The pager next/prev links to display, if any
+ * - $exposed: Exposed widget form/info to display
+ * - $feed_icon: Feed icon to display, if any
+ * - $more: A link to view more, if any
+ * - $admin_links: A rendered list of administrative links
+ * - $admin_links_raw: A list of administrative links suitable for theme('links')
+ *
+ * @ingroup views_templates
+ */
+?>
+<div class="view view-<?php print $css_name; ?> view-id-<?php print $name; ?> view-display-id-<?php print $display_id; ?> view-dom-id-<?php print $dom_id; ?>">
+  <?php if ($admin_links): ?>
+    <div class="views-admin-links views-hide">
+      <?php print $admin_links; ?>
+    </div>
+  <?php endif; ?>
+  <?php if ($title): ?>
+    <div class="view-title">
+      <?php print $title; ?>
+    </div>
+  <?php endif; ?>
+  <?php if ($header): ?>
+    <div class="view-header">
+      <?php print $header; ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($exposed): ?>
+    <div class="view-filters">
+      <?php print $exposed; ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($attachment_before): ?>
+    <div class="attachment-before">
+      <?php print $attachment_before; ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($rows): ?>
+    <div class="view-content">
+      <?php print $rows; ?>
+    </div>
+  <?php elseif ($empty): ?>
+    <div class="view-empty">
+      <?php print $empty; ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($pager): ?>
+    <?php print $pager; ?>
+  <?php endif; ?>
+
+  <?php if ($attachment_after): ?>
+    <div class="attachment-after">
+      <?php print $attachment_after; ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($more): ?>
+    <?php print $more; ?>
+  <?php endif; ?>
+
+  <?php if ($footer): ?>
+    <div class="view-footer">
+      <?php print $footer; ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($feed_icon): ?>
+    <div class="feed-icon">
+      <?php print $feed_icon; ?>
+    </div>
+  <?php endif; ?>
+
+</div> <?php // class view ?>
Index: views_attach.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_attach/views_attach.module,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 views_attach.module
--- views_attach.module	22 Feb 2009 23:05:36 -0000	1.1.2.7
+++ views_attach.module	13 May 2009 05:43:02 -0000
@@ -94,14 +94,7 @@ function views_attach_nodeapi(&$node, $o
         $args = $view->display_handler->get_option('default_argument') === 'nid' ? array($node->nid) : array();
         $result = $view->execute_display($info['display'], $args);
         if (!empty($result)) {
-          // This is not really a form item, but by using item here we get
-          // all of the built in theming of #title and don't need to introduce
-          // a new theme function.  That does mean we get an extra div of class
-          // form-item which MAY confuse some advanced theming.  @todo: Clean this
-          // up if it causes problems.
           $node->content[$view->name . '_' . $info['display']] = array(
-            '#title' => $view->display_handler->get_option('show_title') ? $view->get_title() : '',
-            '#type' => 'item',
             '#weight' => module_exists('content') ? content_extra_field_weight($node->type, $view->name . '_' . $info['display']) : 10,
             '#value' => $result,
           );
Index: views_attach.theme.inc
===================================================================
RCS file: views_attach.theme.inc
diff -N views_attach.theme.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ views_attach.theme.inc	13 May 2009 05:43:02 -0000
@@ -0,0 +1,10 @@
+<?php
+
+function template_preprocess_views_attach_node_content_view(&$vars) {
+  template_preprocess_views_view($vars);
+  $view = $vars['view'];
+  $display = $view->display_handler;
+  if ($display->get_option('show_title')) {
+    $vars['title'] = filter_xss_admin($view->get_title());
+  }
+}
Index: views_attach.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_attach/views_attach.views.inc,v
retrieving revision 1.1
diff -u -p -r1.1 views_attach.views.inc
--- views_attach.views.inc	13 Jan 2009 08:07:10 -0000	1.1
+++ views_attach.views.inc	13 May 2009 05:43:02 -0000
@@ -24,7 +24,9 @@ function views_attach_views_plugins() {
         'title' => t('Node content'),
         'help' => t("Display the view as part of a node's content."),
         'handler' => 'views_attach_plugin_display_node_content',
-        'theme' => 'views_view',
+        'theme' => 'views_attach_node_content_view',
+        'theme file' => 'views_attach.theme.inc',
+        'theme path' => drupal_get_path('module', 'views_attach'),
         'uses hook nodeapi' => TRUE,
         'use ajax' => TRUE,
         'use pager' => TRUE,