Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.153.2.24 -r1.153.2.25
--- openacs-4/packages/xowiki/xowiki.info	28 Jan 2017 18:07:32 -0000	1.153.2.24
+++ openacs-4/packages/xowiki/xowiki.info	3 Feb 2017 12:57:00 -0000	1.153.2.25
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.9.1d17" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d17.apm">
+    <version name="5.9.1d18" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d18.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2016-09-08</release-date>
@@ -55,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.9.1d17"/>
+        <provides url="xowiki" version="5.9.1d18"/>
         <requires url="acs-datetime" version="5.9.0"/>
         <requires url="acs-kernel" version="5.9.0"/>
 	<requires url="acs-tcl" version="5.9.1d13"/>
@@ -65,7 +65,7 @@
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="5.9.0"/>
         <requires url="general-comments" version="5.9.0"/>
-        <requires url="xotcl-core" version="0.154"/>
+        <requires url="xotcl-core" version="0.155"/>
 
         <callbacks>
             <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.485.2.47 -r1.485.2.48
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	2 Feb 2017 13:29:09 -0000	1.485.2.47
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	3 Feb 2017 12:57:00 -0000	1.485.2.48
@@ -1470,34 +1470,38 @@
 
     @return cr item object
   } {
-
+    ns_log notice "=== fetch_object $item_id"
     #
     # We handle here just loading object instances via item_id, since
     # only live_revisions are kept in xowiki_form_instance_item_index.
-    # The loading via revisions happens as before in CrClass.
+    # The loading via revision_id happens as before in CrClass.
     #
     if {$item_id == 0} {
       return [next]
     }
-
+    
     if {![::xotcl::Object isobject $object]} {
       # if the object does not yet exist, we have to create it
       my create $object
     }
 
-    $object set item_id $item_id
-    set sql [::xo::dc prepare -argtypes integer {
-      select * from xowiki_form_instance_item_view where item_id = :item_id
-    }]
-    set success [$object db_0or1row [my qn fetch_from_view_item_id] $sql]
-    if {$success == 0} {
+    db_with_handle db {
+      set sql [::xo::dc prepare -handle $db -argtypes integer {
+        select * from xowiki_form_instance_item_view where item_id = :item_id
+      }]
+      set selection [db_exec 0or1row $db dbqd..Formpage-fetch_object $sql]
+    }
+
+    if {$selection eq ""} {
       error [subst {
         The form page with item_id $item_id was not found in the xowiki_form_instance_item_index.
         Consider 'DROP TABLE xowiki_form_instance_item_index CASCADE;' and restart server
         (the table is rebuilt automatically)
       }]
     }
 
+    $object mset [ns_set array $selection]
+
     if {$initialize} {
       $object initialize_loaded_object
     }