Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.180.2.8 -r1.180.2.9
--- openacs-4/packages/xowiki/xowiki.info	18 Apr 2019 08:07:54 -0000	1.180.2.8
+++ openacs-4/packages/xowiki/xowiki.info	9 May 2019 15:07:38 -0000	1.180.2.9
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d28" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d28.apm">
+    <version name="5.10.0d29" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d29.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>2017-08-06</release-date>
@@ -55,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.10.0d28"/>
+        <provides url="xowiki" version="5.10.0d29"/>
         <requires url="xotcl-core" version="5.10.0d16"/>
 	<requires url="acs-datetime" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
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.542.2.16 -r1.542.2.17
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 May 2019 14:43:18 -0000	1.542.2.16
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 May 2019 15:07:38 -0000	1.542.2.17
@@ -371,7 +371,8 @@
       SELECT
          xi.package_id, xi.parent_id, xi.name,
          $hkey_in_view xi.publish_status, xi.assignee, xi.state, xi.page_template, xi.item_id,
-         o.object_id, o.object_type, o.title AS object_title, o.context_id,
+         o.object_id, o.object_type, o.title AS object_title,
+         (select context_id from acs_objects where object_id = xi.item_id) as context_id,
          o.security_inherit_p, o.creation_user, o.creation_date, o.creation_ip,
          o.last_modified, o.modifying_user, o.modifying_ip,
          cr.revision_id, cr.title, content_revision__get_content(cr.revision_id) AS text,
Index: openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl,v
diff -u -N -r1.15.2.2 -r1.15.2.3
--- openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl	8 May 2019 19:59:57 -0000	1.15.2.2
+++ openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl	9 May 2019 15:07:38 -0000	1.15.2.3
@@ -783,6 +783,17 @@
       }
     }
 
+    set v 5.10.0d29
+    if {[apm_version_names_compare $from_version_name $v] == -1 &&
+        [apm_version_names_compare $to_version_name $v] > -1} {
+      ns_log notice "-- upgrading to $v"
+
+      ns_log notice "dropping view xowiki_form_instance_item_view"
+      ::xo::dc dml drop {
+        drop view if exists xowiki_form_instance_item_view
+      }
+    }
+
   }
     
 }