Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v
diff -u -N -r1.39 -r1.40
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	21 Oct 2017 15:58:14 -0000	1.39
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	24 Nov 2017 09:06:17 -0000	1.40
@@ -388,45 +388,17 @@
   }
 
   proc read_file {fn} {
-    set F [open $fn]
-    fconfigure $F -translation binary
-    set content [read $F]
-    close $F
-    return $content
+    ad_log warning "::xowiki::read_file is deprecated. Please use ::xo::read_file instead"
+    return [::xo::read_file $fn]
   }
   proc write_file {fn content} {
-    set F [::open $fn w]
-    ::fconfigure $F -translation binary -encoding binary
-    ::puts -nonewline $F $content
-    ::close $F
+    ad_log warning "::xowiki::write_file is deprecated. Please use ::xo::write_file instead"
+    return [::xo::write_file $fn $content]
   }
   
   nsf::proc ::xowiki::get_raw_request_body {-as_string:switch -as_file:switch} {
-    if {$as_string eq $as_file} {
-      error "either -as_string or -as_file must be specified"
-    }
-    set contentfile [ns_conn contentfile]
-    if {$as_file} {
-      #
-      # If the file was not spooled, obtained it via [ns_conn content]
-      # as write it to a file.
-      #
-      if {$contentfile eq ""} {
-        set contentfile [ad_tmpnam]
-        write_file $contentfile [ns_conn content -binary]
-      }
-      set result $contentfile
-    } else {
-      #
-      # Return the result as a string
-      #
-      if {$contentfile eq ""} {
-        set result [ns_conn content -binary]
-      } else {
-        set result [read_file $contentfile]
-      }
-    }
-    return $result
+    ad_log warning "::xowiki::get_raw_request_body is deprecated. Please use ::xo::get_raw_request_body instead"
+    return [::xo::get_raw_request_body -as_string=$as_string -as_file=$as_file]
   }
 
   proc ::xowiki::page_order_uses_ltree {} {
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.335 -r1.336
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	8 Nov 2017 08:08:21 -0000	1.335
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	24 Nov 2017 09:06:17 -0000	1.336
@@ -1187,7 +1187,7 @@
         [::xo::dc select \
              -vars "count(*) as nr, tag" \
              -from "xowiki_tags" \
-             -where "item_id = :item_id" \
+             -where "item_id = ${:item_id}" \
              -groupby "tag" \
              -orderby "nr" \
              -limit $limit] {