Index: modules/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload.module,v
retrieving revision 1.96
diff -u -F^f -r1.96 upload.module
--- modules/upload.module	18 Apr 2006 08:32:04 -0000	1.96
+++ modules/upload.module	25 Apr 2006 16:37:12 -0000
@@ -367,7 +367,9 @@ function upload_nodeapi(&$node, $op, $te
 
         // Add the attachments list to node body
         if (count($node->files) && !$teaser) {
-          $node->body .= theme('upload_attachments', $node->files);
+          $node->teaser = theme('upload_teaser', $node);
+          $node->body = theme('upload_body', $node, $request);
+
         }
       }
       break;
@@ -418,6 +420,20 @@ function upload_nodeapi(&$node, $op, $te
 }
 
 /**
+ * Theme placement of attachments table in a teaser (exluded by default)
+ */
+function theme_upload_teaser($node) {
+ return $node->teaser;
+}
+
+/**
+ * Theme placement of attachments table in a body
+ */
+function theme_upload_body($node, $size) {
+ return $node->body . theme('upload_attachments', $node->files);
+}
+
+/**
  * Displays file attachments in table
  */
 function theme_upload_attachments($files) {