Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/contacts/contacts.info	5 Oct 2005 22:15:19 -0000	1.32
+++ openacs-4/packages/contacts/contacts.info	7 Oct 2005 22:57:30 -0000	1.33
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.0d19" url="http://openacs.org/repository/download/apm/contacts-1.0d19.apm">
+    <version name="1.0d20" url="http://openacs.org/repository/download/apm/contacts-1.0d20.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>This application lets you collaboratively view, edit and categorize contacts.</summary>
-        <release-date>2005-10-05</release-date>
+        <release-date>2005-10-07</release-date>
         <description format="text/plain">Contacts is an application for managing all those people and or organization you need to keep track of. It has a complete UI for storing and categorizing contacts. Each contact can have an arbitrary number of custom attributes associated with it, including other contacts (i.e. a certain contact &quot;belongs&quot; to a certain organization). It also functions as a service contract provider for attributes related to users in your system</description>
         <maturity>0</maturity>
 
-        <provides url="contacts" version="1.0d19"/>
+        <provides url="contacts" version="1.0d20"/>
         <requires url="acs-tcl" version="5.2.0b3"/>
         <requires url="ams" version="1.0d"/>
         <requires url="categories" version="1.0d6"/>
@@ -24,8 +24,8 @@
 
         <callbacks>
             <callback type="after-install"  proc="contacts::install::package_install"/>
-            <callback type="after-instantiate"  proc="contacts::install::package_instantiate"/>
             <callback type="after-upgrade"  proc="contacts::install::package_upgrade"/>
+            <callback type="after-instantiate"  proc="contacts::install::package_instantiate"/>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="AcceptableFileUploadMIMETypes"  default="*" description="* for any. CSV of acceptable MIME Types for File Upload" section_name="File Upload"/>
Index: openacs-4/packages/contacts/tcl/contact-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-message-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/contacts/tcl/contact-message-procs.tcl	8 Sep 2005 18:05:19 -0000	1.4
+++ openacs-4/packages/contacts/tcl/contact-message-procs.tcl	7 Oct 2005 22:57:29 -0000	1.5
@@ -108,19 +108,21 @@
     set creation_ip [ad_conn peeraddr]
     set package_id [ad_conn package_id]
     # We make every message logged in this table an acs_object
-    set object_id [db_string create_acs_object { select acs_object__new (
-									 null,
-									 'contact_message_log',
-									 :sent_date,
-									 :sender_id,
-									 :creation_ip,
-									 :package_id
-									 ) } ]
-    db_dml log_message {
-	insert into contact_message_log
-	( message_id, message_type, sender_id, recipient_id, sent_date, title, description, content, content_format)
-        values
-        ( :object_id, :message_type, :sender_id, :recipient_id, :sent_date, :title, :description, :content, :content_format)
+    if { ![string equal $message_type "email"] } {
+	set object_id [db_string create_acs_object { select acs_object__new (
+									     null,
+									     'contact_message_log',
+									     :sent_date,
+									     :sender_id,
+									     :creation_ip,
+									     :package_id
+									     ) } ]
+	db_dml log_message {
+	    insert into contact_message_log
+	    ( message_id, message_type, sender_id, recipient_id, sent_date, title, description, content, content_format)
+	    values
+	    ( :object_id, :message_type, :sender_id, :recipient_id, :sent_date, :title, :description, :content, :content_format)
+	}
     }
 }