Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.60.2.6 -r1.60.2.7
--- openacs-4/packages/xowiki/xowiki.info	28 Mar 2008 10:28:04 -0000	1.60.2.6
+++ openacs-4/packages/xowiki/xowiki.info	9 Oct 2008 20:45:18 -0000	1.60.2.7
@@ -8,11 +8,11 @@
     <singleton-p>f</singleton-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.60.4" url="http://openacs.org/repository/download/apm/xowiki-0.60.4.apm">
+    <version name="0.60.5" url="http://openacs.org/repository/download/apm/xowiki-0.60.5.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>2007-09-13</release-date>
+        <release-date>2008-10-09</release-date>
         <description format="text/html">&lt;pre&gt;
 XoWiki is a Wiki implementation for OpenACS in XOTcl. Instead of
 trying to implement the full set of Wiki markup commands of systems
@@ -53,16 +53,16 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.60.4"/>
+        <provides url="xowiki" version="0.60.5"/>
         <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.56.3"/>
 
         <callbacks>
-            <callback type="after-install"  proc="::xowiki::after-install"/>
             <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
+            <callback type="after-install"  proc="::xowiki::after-install"/>
             <callback type="after-upgrade"  proc="::xowiki::upgrade_callback"/>
         </callbacks>
         <parameters>
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.32.2.9 -r1.32.2.10
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	28 Mar 2008 22:02:15 -0000	1.32.2.9
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	9 Oct 2008 20:45:18 -0000	1.32.2.10
@@ -490,6 +490,7 @@
     style
   }
   FormField::textarea instproc initialize {} {
+    foreach m [my info mixin] {if {[$m exists editor_mixin]} {my mixin delete $m}}
     my set widget_type text(textarea)
     foreach p [list rows cols style] {if {[my exists $p]} {my set html($p) [my $p]}}
     next