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 -r1.542.2.19 -r1.542.2.20
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	10 May 2019 15:09:05 -0000	1.542.2.19
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	10 May 2019 16:05:20 -0000	1.542.2.20
@@ -380,7 +380,8 @@
          o.last_modified, o.modifying_user, o.modifying_ip,
          cr.revision_id, cr.title, content_revision__get_content(ci.live_revision) AS text,
          cr.description, cr.publish_date, cr.mime_type, cr.nls_language,
-         xowiki_form_page.xowiki_form_page_id,
+         (select xowiki_form_page_id from xowiki_form_page
+          where xowiki_form_page_id = ci.live_revision) as xowiki_form_page_id,
          xowiki_page_instance.page_instance_id,
          xowiki_page_instance.instance_attributes,
          xowiki_page.page_id,
@@ -392,7 +393,6 @@
          left join acs_objects o on (o.object_id = ci.live_revision)
          left join xowiki_page on (xowiki_page.page_id = ci.live_revision)
          left join xowiki_page_instance on (xowiki_page_instance.page_instance_id = ci.live_revision)
-         left join xowiki_form_page on (xowiki_form_page.xowiki_form_page_id = ci.live_revision)
     }]
   } else {
     set sql [subst {
@@ -405,7 +405,8 @@
          o.last_modified, o.modifying_user, o.modifying_ip,
          cr.revision_id, cr.title, content_revision__get_content(cr.revision_id) AS text,
          cr.description, cr.publish_date, cr.mime_type, cr.nls_language,
-         xowiki_form_page.xowiki_form_page_id,
+         (select xowiki_form_page_id from xowiki_form_page
+          where xowiki_form_page_id = ci.live_revision) as xowiki_form_page_id,
          xowiki_page_instance.page_instance_id,
          xowiki_page_instance.instance_attributes,
          xowiki_page.page_id,
@@ -417,7 +418,6 @@
          left join acs_objects o on (o.object_id = ci.live_revision)
          left join xowiki_page on (o.object_id = xowiki_page.page_id)
          left join xowiki_page_instance on (o.object_id = xowiki_page_instance.page_instance_id)
-         left join xowiki_form_page on (o.object_id = xowiki_form_page.xowiki_form_page_id)
     }]
   }
   ::xo::db::require view xowiki_form_instance_item_view $sql