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.13 -r1.14
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 Feb 2006 22:53:03 -0000	1.13
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	11 Feb 2006 00:57:44 -0000	1.14
@@ -263,6 +263,20 @@
     my set submit_link pages/[$data lang]/[ad_urlencode [$data set title]]?
   }
 
+  WikiForm instproc new_request {} {
+    my instvar data
+    $data set creator [$data get_name [ad_conn user_id]]
+    next
+  }
+
+  WikiForm instproc edit_request args {
+    my instvar data
+    if {[$data set creator] eq ""} {
+      $data set creator [$data get_name [ad_conn user_id]]
+    }
+    next
+  }
+
   WikiForm instproc new_data {} {
     my handle_enhanced_text_from_form
     set item_id [next]
@@ -315,6 +329,7 @@
     }
     next
   }
+
   ObjectForm instproc new_request {} {
     my instvar data
     permission::require_permission \
@@ -474,7 +489,7 @@
 
   Page ad_proc require_folder_object {
     -folder_id
-    -package_id 
+    -package_id:required 
   } {
   } {
     if {![::xotcl::Object isobject ::$folder_id]} {
@@ -492,7 +507,8 @@
 	$o save_new
 	$o initialize_loaded_object
       }
-      $o proc destroy {} {my log "--f "; next}
+      #$o proc destroy {} {my log "--f "; next}
+      $o set package_id $package_id
       my log "--f exists $o -> [::xotcl::Object isobject $o]"
       uplevel #0 [list $o volatile]
     } else {
Index: openacs-4/packages/xowiki/www/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/edit.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/xowiki/www/edit.tcl	9 Feb 2006 22:53:03 -0000	1.5
+++ openacs-4/packages/xowiki/www/edit.tcl	11 Feb 2006 00:57:44 -0000	1.6
@@ -26,6 +26,7 @@
   set page [CrItem instantiate -item_id $item_id]     ;# no revision_id yet
   set folder_id   [$page set parent_id]
   set object_type [$page info class]
+  ::xowiki::Page require_folder_object -folder_id $folder_id -package_id [ad_conn package_id]
 } else {
   set page [$object_type new]
   if {![info exists folder_id]} {
Index: openacs-4/packages/xowiki/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/xowiki/www/view.tcl	9 Feb 2006 22:53:03 -0000	1.6
+++ openacs-4/packages/xowiki/www/view.tcl	11 Feb 2006 00:57:44 -0000	1.7
@@ -22,6 +22,9 @@
 	      -item_id $item_id \
 	      -revision_id $revision_id]
 
+if {![info exists folder_id]} {set folder_id [$page set parent_id]}
+::xowiki::Page require_folder_object -folder_id $folder_id -package_id [ad_conn package_id]
+
 set content [$page render]
 set references [$page references]
 
Index: openacs-4/packages/xowiki/www/portlets/categories.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/categories.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/xowiki/www/portlets/categories.tcl	9 Feb 2006 22:53:04 -0000	1.4
+++ openacs-4/packages/xowiki/www/portlets/categories.tcl	11 Feb 2006 00:57:44 -0000	1.5
@@ -1,12 +1,15 @@
+# $Id$
+# display the category tree with associated pages
+# -gustaf neumann
+# 
 # valid parameters from the include are 
 #     tree_name: match pattern, if specified displays only the trees with matching names
 #     no_tree_name: if specified, only tree names are not displayed
 
 # get the folder id from the including page
-set folder_id [$__including_page set parent_id]
-set package_id [db_string get_package_id \
-		    "select package_id from acs_objects where object_id = $folder_id"]
-set url_prefix [site_node::get_url_from_object_id -object_id $package_id]
+set folder_id   [$__including_page set parent_id]
+set package_id  [$folder_id set package_id]
+set url_prefix  [site_node::get_url_from_object_id -object_id $package_id]
 
 set content ""
 foreach tree [category_tree::get_mapped_trees $package_id] {
Index: openacs-4/packages/xowiki/www/portlets/wiki.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/wiki.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/xowiki/www/portlets/wiki.tcl	30 Jan 2006 02:04:51 -0000	1.2
+++ openacs-4/packages/xowiki/www/portlets/wiki.tcl	11 Feb 2006 00:57:44 -0000	1.3
@@ -1,5 +1,7 @@
+# $Id$
+# display a wiki page included in a different wiki page
+# -gustaf neumann
 
-# get the folder id from the including page
 set folder_id [$__including_page set parent_id]
 set item_id   [::Generic::CrItem lookup -title $name -parent_id $folder_id]
 set page      [::Generic::CrItem instantiate -item_id $item_id]