Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.239.2.90 -r1.239.2.91
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	19 Jun 2022 15:33:24 -0000	1.239.2.90
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	13 Jul 2022 10:41:43 -0000	1.239.2.91
@@ -2932,7 +2932,7 @@
     regsub -nocase -all "<form " $inner_html "<div class='form' " inner_html
     regsub -nocase -all "<form>" $inner_html "<div class='form'>" inner_html
     regsub -nocase -all "</form *>" $inner_html "</div>" inner_html
-    dom parse -simple -html <form>$inner_html</form> doc
+    dom parse -simple <form>$inner_html</form> doc
     $doc documentElement root
 
     set fields [$root selectNodes "//div\[@class = 'wiki-menu'\]"]
Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -N -r1.147.2.24 -r1.147.2.25
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	15 Apr 2022 17:28:34 -0000	1.147.2.24
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl	13 Jul 2022 10:41:43 -0000	1.147.2.25
@@ -853,7 +853,7 @@
   proc ::xowiki::validate_form_form {} {
     upvar form form
     if {$form eq ""} {return 1}
-    dom parse -simple -html [lindex $form 0] doc
+    dom parse -simple [lindex $form 0] doc
     $doc documentElement root
     return [expr {$root ne "" && [$root nodeName] eq "form"}]
   }
@@ -882,7 +882,7 @@
     # provide unique ids and names, if form is provided
     #     set form [${:data} set form]
     #     if {$form ne ""} {
-    #       dom parse -simple -html [lindex $form 0] doc
+    #       dom parse -simple [lindex $form 0] doc
     #       $doc documentElement root
     #       set id ID$item_id
     #       $root setAttribute id $id
Index: openacs-4/packages/xowiki/tcl/xowiki-init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-init.tcl,v
diff -u -N -r1.3.2.5 -r1.3.2.6
--- openacs-4/packages/xowiki/tcl/xowiki-init.tcl	1 Feb 2022 19:28:28 -0000	1.3.2.5
+++ openacs-4/packages/xowiki/tcl/xowiki-init.tcl	13 Jul 2022 10:41:43 -0000	1.3.2.6
@@ -23,7 +23,7 @@
 }
 
 set ::xowiki::search_mounted_p 1
-set search_driver [parameter::get -package_id [apm_package_id_from_key search] \
+set search_driver [parameter::get_from_package_key -package_key search \
                        -parameter FtsEngineDriver]
 
 #
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.542.2.160 -r1.542.2.161
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	22 Jun 2022 17:49:10 -0000	1.542.2.160
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	13 Jul 2022 10:41:43 -0000	1.542.2.161
@@ -3452,7 +3452,7 @@
     #:msg status=[$r set status]
     if {$status == 200} {
       #:msg data=$data
-      dom parse -simple -html $data doc
+      dom parse -simple $data doc
       $doc documentElement root
       set n [$root selectNodes {//*[@id="result_box"]}]
       :msg "$text $from=>$to node '$n'"
@@ -3695,7 +3695,7 @@
     regsub -all -- "/span>\n<span " $data "/span><br><span " data
     regsub -all -- "/span>\n\n<span " $data "/span><br><br><span " data
 
-    dom parse -html $data doc
+    dom parse -simple $data doc
     $doc documentElement root
 
     #
@@ -4251,7 +4251,7 @@
   }
 
   Form proc disable_input_fields {{-with_submit 0} form} {
-    dom parse -simple -html $form doc
+    dom parse -simple $form doc
     $doc documentElement root
     if {$root ne ""} {
       :dom_disable_input_fields -with_submit $with_submit $root
@@ -4295,7 +4295,7 @@
       #
       # The method "disable_input_fields" consists essentially of
       #
-      #     dom parse -simple -html $form doc
+      #     dom parse -simple $form doc
       #     ...
       #     return [$root asHTML]
       #
@@ -5152,7 +5152,7 @@
         lappend field_names $att
       }
       #ns_log notice "field_names_from_form: [:serialize]"
-      dom parse -simple -html $form doc
+      dom parse -simple $form doc
       $doc documentElement root
       set fields [$root selectNodes "//*\[@name != ''\]"]
       foreach field $fields {
@@ -5296,7 +5296,7 @@
                     {:form_field_as_html -mode display "\\\1" "\2" $form_fields}]
 
       # we parse the form just for the margin-form.... maybe regsub?
-      dom parse -simple -html $form :doc
+      dom parse -simple $form :doc
       ${:doc} documentElement :root
       set form_node [lindex [${:root} selectNodes //form] 0]
 
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 -N -r1.368.2.123 -r1.368.2.124
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	2 Jun 2022 10:00:22 -0000	1.368.2.123
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	13 Jul 2022 10:41:43 -0000	1.368.2.124
@@ -1309,7 +1309,7 @@
     set form [string map [list @ \x03] $form]
     #:msg form=$form
 
-    dom parse -simple -html $form :doc
+    dom parse -simple $form :doc
     ${:doc} documentElement :root
 
     if {${:root} eq ""} {