Index: openacs-4/packages/xowf/xowf.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/xowf.info,v
diff -u -r1.3.2.4 -r1.3.2.5
--- openacs-4/packages/xowf/xowf.info	2 May 2016 18:48:33 -0000	1.3.2.4
+++ openacs-4/packages/xowf/xowf.info	11 May 2016 07:00:07 -0000	1.3.2.5
@@ -9,14 +9,14 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.9.1d2" url="http://openacs.org/repository/download/apm/xowf-5.9.1d2.apm">
+    <version name="5.9.1d3" url="http://openacs.org/repository/download/apm/xowf-5.9.1d3.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>XoWiki Content Flow - an XoWiki based workflow system implementing state-based behavior of wiki pages and forms</summary>
         <release-date>2015-10-04</release-date>
         <vendor url="http://wu.ac.at">WU Vienna</vendor>
         <maturity>2</maturity>
 
-        <provides url="xowf" version="5.9.1d2"/>
+        <provides url="xowf" version="5.9.1d3"/>
         <requires url="xowiki" version="5.9.1d1"/>
 
         <callbacks>
Index: openacs-4/packages/xowf/tcl/xowf-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/xowf-procs.tcl,v
diff -u -r1.3.2.6 -r1.3.2.7
--- openacs-4/packages/xowf/tcl/xowf-procs.tcl	2 May 2016 21:19:07 -0000	1.3.2.6
+++ openacs-4/packages/xowf/tcl/xowf-procs.tcl	11 May 2016 07:00:07 -0000	1.3.2.7
@@ -163,6 +163,7 @@
     } else {
       set fc ""
     }
+    set package_id [$object package_id]
     return [::xowiki::Form new -destroy_on_cleanup \
                 -package_id $package_id \
                 -parent_id [$package_id folder_id] \
@@ -202,7 +203,7 @@
         # When no form was found by the form loader ($form_id == 0) we
         # create automatically a form.
         #
-        set form_object [my create_auto_form $object$]
+        set form_object [my create_auto_form $object]
       }
     } else {
       #my msg "using custom form loader $loader for [my form]"
@@ -215,7 +216,8 @@
     #
     #my msg form_id=$form_id
 
-    if {[string is integer -strict $form_id]
+    if {![info exists form_object]
+        && [string is integer -strict $form_id]
         && $form_id > 0
         && ![my isobject ::$form_id]} {
       ::xo::db::CrClass get_instance_from_db -item_id $form_id