Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.132 -r1.133
--- openacs-4/packages/xowiki/xowiki.info	18 Jun 2010 10:24:59 -0000	1.132
+++ openacs-4/packages/xowiki/xowiki.info	25 Jun 2010 08:49:59 -0000	1.133
@@ -10,11 +10,11 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.131" url="http://openacs.org/repository/download/apm/xowiki-0.131.apm">
+    <version name="0.132" url="http://openacs.org/repository/download/apm/xowiki-0.132.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A more generic xotcl-based wikis example with object types
 and subtypes based on the content repository (with category support)</summary>
-        <release-date>2010-06-18</release-date>
+        <release-date>2010-06-25</release-date>
         <vendor>Gustaf Neumann, WU Wien</vendor>
         <description format="text/html">&lt;pre&gt;
 XoWiki is a Wiki implementation for OpenACS in XOTcl. Instead of
@@ -56,12 +56,12 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.130"/>
+        <provides url="xowiki" version="0.132"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
         <requires url="general-comments" version="4.6.1"/>
-        <requires url="xotcl-core" version="0.115"/>
+	<requires url="xotcl-core" version="0.116"/>
 
         <callbacks>
             <callback type="after-install"  proc="::xowiki::after-install"/>
Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v
diff -u -r1.63 -r1.64
--- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	18 Jun 2010 10:24:59 -0000	1.63
+++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	25 Jun 2010 08:49:59 -0000	1.64
@@ -521,8 +521,9 @@
 
       ::xowiki::Package initialize -package_id [::xowiki::Package first_instance]
       ::xowiki::Package require_site_wide_pages
-      foreach p [::xowiki::Package instances] {::xowiki::transform_root_folder $p}
-      foreach p [::xowf::Package instances] {::xowiki::transform_root_folder $p}
+      foreach p [::xowiki::Package instances -closure true] {
+	::xowiki::transform_root_folder $p
+      }
 
       foreach package_id [::xowiki::Package instances] {
 	::xowiki::Package initialize -package_id $package_id
@@ -557,20 +558,17 @@
     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"
-      foreach pp [::xo::PackageMgr info instances] {
-        foreach package_id [$pp instances] {
-          ::xo::Package initialize -package_id $package_id
-          if {![$package_id istype ::xowiki::Package]} continue
-          # strip language prefix from folder pages
-          set ff [::xowiki::Weblog instantiate_forms -forms en:folder.form -package_id $package_id]
-          set e [::xowiki::FormPage get_form_entries -form_fields "" \
-                     -base_item_ids $ff -package_id $package_id \
-                     -always_queried_attributes *]
-          foreach fp [$e children] {
-            set n [$fp name]
-            regexp {^..:(.+)$} $n . n
-            $fp rename -old_name [$fp name] -new_name $n
-          }
+      foreach package_id [::xowiki::Package instances -closure true] {
+	::xowiki::Package initialize -package_id $package_id -init_url false
+	# strip language prefix from folder pages
+	set ff [::xowiki::Weblog instantiate_forms -forms en:folder.form -package_id $package_id]
+	set e [::xowiki::FormPage get_form_entries -form_fields "" \
+		   -base_item_ids $ff -package_id $package_id \
+		   -always_queried_attributes *]
+	foreach fp [$e children] {
+	  set n [$fp name]
+	  regexp {^..:(.+)$} $n . n
+	  $fp rename -old_name [$fp name] -new_name $n
         }
       }
     }