Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.184 -r1.185
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	5 Nov 2009 12:34:16 -0000	1.184
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	6 Nov 2009 12:26:18 -0000	1.185
@@ -956,16 +956,11 @@
 
   Package instproc require_folder_object { } {
     my instvar id folder_id
-    #my msg "--f [my isobject ::$folder_id] folder_id=$folder_id"
+    # TODO: we should make a parameter allowed_page_types (see content_types), 
+    # but the package admin should not have necessarily the rights to change it
+    set folder_id [my require_root_folder -name "xowiki: $id" \
+                       -content_types ::xowiki::Page* ]
 
-    if {$folder_id == 0} {
-      # TODO: we should make a parameter allowed_page_types (see content_types), 
-      # but the package admin should not have necessarily the rights to change it
-      set folder_id [::xowiki::Page require_folder \
-			 -name xowiki -package_id $id \
-			 -content_types ::xowiki::Page* ]
-    }
-
     if {![::xotcl::Object isobject ::$folder_id]} {
       # if we can't get the folder from the cache, create it
       if {[catch {eval [nsv_get xotcl_object_cache ::$folder_id]}]} {