Index: openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml	15 Oct 2003 15:28:21 -0000	1.13
+++ openacs-4/packages/attachments/catalog/attachments.en_US.ISO-8859-1.xml	24 Nov 2003 17:57:55 -0000	1.13.2.1
@@ -41,7 +41,7 @@
   <msg key="lt_Use_the_Browse_button">Use the &quot;Browse...&quot; button to locate your file, 
     then click &quot;Open&quot;.</msg>
   <msg key="lt_You_are_attaching_a_d">You are attaching a document to %pretty_object_name%.</msg>
-  <msg key="lt_You_probably_clicked_">You probably clicked on the Add button more than once. Check if the file is properly loaded on the &lt;a href=&quot;%folder_url%&quot;&gt;folder&lt;/a&gt; you want, or you can use the Back button to return and re-enter the version file.</msg>
+  <msg key="lt_You_probably_clicked_">You probably clicked on the Add button more than once. Check if the file is properly loaded on the &lt;a href=&quot;%folder_url%&quot;&gt;folder&lt;/a&gt; you want, or you can use the Back button to return and re-enter the version file. Here is the error message: &lt;pre&gt;%errmsg%&lt;pre&gt;</msg>
   <msg key="lt_Your_file_is_larger_t">Your file is larger than the maximum file size allowed on this system (%max_number_of_bytes% bytes)</msg>
   <msg key="Name">Name</msg>
   <msg key="No_such_type">No such type</msg>
Index: openacs-4/packages/attachments/www/attach-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach-2.tcl,v
diff -u -r1.3 -r1.3.6.1
--- openacs-4/packages/attachments/www/attach-2.tcl	10 Sep 2002 22:22:22 -0000	1.3
+++ openacs-4/packages/attachments/www/attach-2.tcl	24 Nov 2003 17:57:55 -0000	1.3.6.1
@@ -24,4 +24,3 @@
 }
 
 ad_returnredirect $return_url
-
Index: openacs-4/packages/attachments/www/attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/attachments/www/attach.tcl	24 Nov 2003 15:24:47 -0000	1.6.2.1
+++ openacs-4/packages/attachments/www/attach.tcl	24 Nov 2003 17:57:55 -0000	1.6.2.2
@@ -45,7 +45,7 @@
 set folder_name [lang::util::localize [fs::get_object_name -object_id $folder_id]]
 
 # Folder contents
-db_multirow contents select_folder_contents {} {
+db_multirow -unclobber contents select_folder_contents {} {
     set name [lang::util::localize $name]
 }
 
Index: openacs-4/packages/forums/www/message-post.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.tcl,v
diff -u -r1.28.2.1 -r1.28.2.2
--- openacs-4/packages/forums/www/message-post.tcl	24 Nov 2003 14:57:34 -0000	1.28.2.1
+++ openacs-4/packages/forums/www/message-post.tcl	24 Nov 2003 17:57:55 -0000	1.28.2.2
@@ -109,21 +109,17 @@
 set attachments_enabled_p [forum::attachments_enabled_p]
 
 if {$attachments_enabled_p} {
-    if { ![info exists attach_p] } {
-        set attach_p 0
-    }
-
     element create message attach_p \
             -label [_ forums.Attach] \
             -datatype text \
             -widget radio \
-            -value $attach_p \
+            -value 0 \
             -options [list [list [_ forums.No] 0] [list [_ forums.Yes] 1]]
 }
 
 if {[form is_valid message]} {
     form get_values message \
-        message_id forum_id parent_id subject content html_p confirm_p subscribe_p anonymous_p
+        message_id forum_id parent_id subject content html_p confirm_p subscribe_p anonymous_p attach_p
     
     if { !$anonymous_allowed_p } {
         set anonymous_p 0
@@ -136,6 +132,7 @@
 	set subject.spellcheck ":nospell:"
 	set content.spellcheck ":nospell:"
         set content [string trimright $content]
+
         set exported_vars [export_form_vars message_id forum_id parent_id subject content html_p confirm_p subject.spellcheck content.spellcheck anonymous_p attach_p]
         
         set message(html_p) $html_p
@@ -266,4 +263,3 @@
 } else {
     lappend context [_ forums.Post_a_Message]
 }
-