Index: openacs-4/packages/xotcl-core/xotcl-core.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/xotcl-core.info,v
diff -u -N -r1.92.2.7 -r1.92.2.8
--- openacs-4/packages/xotcl-core/xotcl-core.info	30 Dec 2015 18:09:13 -0000	1.92.2.7
+++ openacs-4/packages/xotcl-core/xotcl-core.info	2 Feb 2016 14:56:44 -0000	1.92.2.8
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xotcl</auto-mount>
 
-    <version name="0.142" url="http://media.wu-wien.ac.at/download/xotcl-core-0.142.apm">
+    <version name="0.143" url="http://media.wu-wien.ac.at/download/xotcl-core-0.143.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>XOTcl library functionality (e.g. thread handling, online documentation, Generic Form and List Classes)</summary>
         <release-date>2015-10-04</release-date>
@@ -48,9 +48,10 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xotcl-core" version="0.142"/>
+        <provides url="xotcl-core" version="0.143"/>
 	<requires url="acs-kernel" version="5.9.0"/>
 	<requires url="acs-api-browser" version="5.9.1d1"/>
+	<requires url="acs-content-repository" version="5.9.1d4"/>
 
         <callbacks>
             <callback type="before-install"  proc="::xotcl-core::before-install"/>
Index: openacs-4/packages/xotcl-core/tcl/cr-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/cr-procs.tcl,v
diff -u -N -r1.54.2.8 -r1.54.2.9
--- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	23 Dec 2015 18:21:56 -0000	1.54.2.8
+++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	2 Feb 2016 14:56:45 -0000	1.54.2.9
@@ -904,7 +904,7 @@
     #my instvar creation_user
     set __atts [list creation_user]
     set __vars $__atts
-    
+
     # The modifying_user is not maintained by the CR (bug?)
     # xotcl-core handles this by having the modifying user as
     # creation_user of the revision.
@@ -930,6 +930,15 @@
       lappend __vars $__slot_name
     }
 
+    if {$use_given_publish_date} {
+      my instvar publish_date
+      lappend __atts publish_date
+      lappend __vars publish_date
+      set publish_date_flag [list -publish_date $publish_date]
+    } else {
+      set publish_date_flag ""
+    }
+
     ::xo::dc transaction {
       [my info class] instvar storage_type
       set revision_id [xo::dc nextval acs_object_id_seq]
@@ -943,17 +952,14 @@
       my fix_content $revision_id $text
 
       if {$live_p} {
-        ::xo::db::sql::content_item set_live_revision \
-            -revision_id $revision_id \
-            -publish_status [my set publish_status]
         #
-        # set_live revision updates publish_date to the current date.
-        # In order to keep a given publish date, we have to update the
-        # field manually.
+        # Update the life revision with the publish status and
+        # optionally the publish_date
         #
-        if {$use_given_publish_date} {
-          my update_revision $revision_id publish_date [my publish_date]
-        }
+        ::xo::db::sql::content_item set_live_revision \
+            -revision_id $revision_id \
+            -publish_status [my set publish_status] \
+            {*}$publish_date_flag
         my set revision_id $revision_id
         my update_item_index
       } else {
@@ -1018,8 +1024,10 @@
     @param creation_user user_id if the creating user
     @param live_p make this revision the live revision
   } {
+    
     set __class [my info class]
     my instvar parent_id item_id import_file name
+    
     if {![info exists package_id] && [my exists package_id]} {
       set package_id [my package_id]
     }
@@ -1041,6 +1049,15 @@
       lappend __atts [$__slot column_name]
       lappend __vars $__slot_name
     }
+    
+    if {$use_given_publish_date} {
+      my instvar publish_date
+      lappend __atts publish_date
+      lappend __vars publish_date
+      set publish_date_flag [list -publish_date $publish_date]
+    } else {
+      set publish_date_flag ""
+    }
 
     ::xo::dc transaction {
       $__class instvar storage_type object_type
@@ -1069,12 +1086,14 @@
       my fix_content $revision_id $text
 
       if {$live_p} {
+        #
+        # Update the life revision with the publish status and
+        # optionally the publish_date
+        #
         ::xo::db::sql::content_item set_live_revision \
             -revision_id $revision_id \
-            -publish_status [my set publish_status] 
-        if {$use_given_publish_date} {
-          my update_revision $revision_id publish_date [my publish_date]
-        }
+            -publish_status [my set publish_status] \
+            {*}$publish_date_flag
         my update_item_index
       }
     }