Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.126 -r1.127
--- openacs-4/packages/xowiki/xowiki.info	2 May 2010 12:50:19 -0000	1.126
+++ openacs-4/packages/xowiki/xowiki.info	31 May 2010 10:03:40 -0000	1.127
@@ -10,11 +10,11 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.125" url="http://openacs.org/repository/download/apm/xowiki-0.125.apm">
+    <version name="0.126" url="http://openacs.org/repository/download/apm/xowiki-0.126.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-05-01</release-date>
+        <release-date>2010-05-31</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,7 +56,7 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.125"/>
+        <provides url="xowiki" version="0.126"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
@@ -70,6 +70,7 @@
             <callback type="after-upgrade"  proc="::xowiki::upgrade_callback"/>
         </callbacks>
         <parameters>
+            <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="MenuBar"  default="0" description="Activate experimental menubar stuff"/>
             <parameter scope="instance" datatype="text"  min_n_values="1"  max_n_values="1"  name="PackageDescription"  description="Description of the Package. This description will appear for example in the Description of the default RSS feed for this package" section_name="Description"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="PackagePath"  description="Space delimited names of local URL paths pointing to xowiki instances from where this instance should inherit pages (example: /xowiki /public/wiki)"/>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="PackageTitle"  description="Title of the Package; this title will appear for example in the default RSS feed for this package." section_name="Description"/>
Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v
diff -u -r1.37 -r1.38
--- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	24 Nov 2009 19:12:31 -0000	1.37
+++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	31 May 2010 10:03:40 -0000	1.38
@@ -92,6 +92,7 @@
   <msg key="search_title">Suche in diesem Wiki...</msg>
   <msg key="second">Sekunde</msg>
   <msg key="seconds">Sekunden</msg>
+  <msg key="subscribe">Abonnieren</msg>
   <msg key="title">Titel</msg>
   <msg key="title_of_event">Titel
 </msg>
Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v
diff -u -r1.54 -r1.55
--- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	15 Nov 2009 11:06:59 -0000	1.54
+++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	31 May 2010 10:03:40 -0000	1.55
@@ -131,6 +131,7 @@
   <msg key="second">second</msg>
   <msg key="seconds">seconds</msg>
   <msg key="select_link_target">To create a click, click on a page name </msg>
+  <msg key="subscribe">Subscribe</msg>
   <msg key="title">Title</msg>
   <msg key="title_of_event">Title
 </msg>
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.265 -r1.266
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	31 May 2010 09:40:10 -0000	1.265
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	31 May 2010 10:03:40 -0000	1.266
@@ -148,8 +148,8 @@
     }
 
     # the menubar is work in progress
-    set mb [$context_package_id get_parameter "menubar" 0]
-    if {$mb ne "" && [info command ::xowiki::MenuBar] ne ""} {
+    set mb [$context_package_id get_parameter "MenuBar" 0]
+    if {$mb ne "0" && [info command ::xowiki::MenuBar] ne ""} {
 
       #
       # Define standard xowiki menubar