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 -r1.200.2.2 -r1.200.2.3
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	26 Aug 2015 08:58:27 -0000	1.200.2.2
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	3 Sep 2015 08:00:52 -0000	1.200.2.3
@@ -1726,7 +1726,7 @@
     set since_condition "time > TO_TIMESTAMP(:since,'YYYY-MM-DD HH24:MI:SS')"
 
     set where_clause "package_id=:package_id and $since_condition $extra_where_clause"
-    set when "<br>in last $interval"
+    set when "<br>in last [ns_quotehtml $interval]"
 
     set output ""
 
@@ -1767,7 +1767,7 @@
     set users [expr {$count == 0 ? "No registered users" : 
                      $count == 1 ? "1 registered user" : 
                      "$count registered users"}]
-    return "<div class='title'>[ns_quotehtml $users$what$when]</div>$output"
+    return "<div class='title'>[ns_quotehtml $users$what]$when</div>$output"
   }
 }
 
Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v
diff -u -r1.70 -r1.70.2.1
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl	24 Jun 2015 15:38:41 -0000	1.70
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl	3 Sep 2015 08:00:53 -0000	1.70.2.1
@@ -274,12 +274,12 @@
     
     if {$page_number ne ""} {
       set nr [llength [$items children]] 
-      set from [expr {($page_number-1)*$page_size+1}]
-      set to   [expr {($page_number-1)*$page_size+$nr}]
+      set from [expr {($page_number-1) * $page_size + 1}]
+      set to   [expr {($page_number-1) * $page_size + $nr}]
       set range [expr {$nr > 1 ? "$from - $to" : $from}]
       
       if {$filter_msg ne ""} {
-        append filter_msg ", $range of $nr_items $entry_label (<a href='[ns_quotehtml $weblog_href]'>all</a>, [ns_quotehtml $flink])"
+        append filter_msg ", $range of $nr_items $entry_label (<a href='[ns_quotehtml $weblog_href]'>all</a>, $flink)"
       } else {
         append filter_msg "Showing $range of $nr_items $entry_label ($flink)"
       }
@@ -288,7 +288,7 @@
       set prev_p [expr {$page_number > 1}]
       
       if {$next_p} {
-        set query [::xo::update_query $query page_number [expr {$page_number+1}]]
+        set query [::xo::update_query $query page_number [expr {$page_number + 1}]]
         set next_page_link [::xo::cc url]?$query
       }
       if {$prev_p} {
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 -r1.485.2.6 -r1.485.2.7
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	2 Sep 2015 11:46:18 -0000	1.485.2.6
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	3 Sep 2015 08:00:53 -0000	1.485.2.7
@@ -1907,21 +1907,21 @@
       set ::xowiki_inclusion_depth 1
     }
     if {$::xowiki_inclusion_depth > 10} {
-      return [my error_in_includelet $arg [_ xowiki.error-includelet-nesting_to_deep]]
+      return [my error_in_includelet $arg [_ xowiki.error-includelet-nesting_to_deep]]$ch2
     }
     if {[regexp {^adp (.*)$} $arg _ adp]} {
       if {[catch {lindex $adp 0} errMsg]} {
         # there is something syntactically wrong
         incr ::xowiki_inclusion_depth -1
-        return [my error_in_includelet $arg [_ xowiki.error-includelet-adp_syntax_invalid]]
+        return [my error_in_includelet $arg [_ xowiki.error-includelet-adp_syntax_invalid]]$ch2
       }
       set adp [string map {&nbsp; " "} $adp]
       #
       # Check the provided name of the adp file
       #
       array set "" [my check_adp_include_path [lindex $adp 0]]
       if {!$(allowed)} {
-        return [my error_in_includelet $arg $(msg)]
+        return [my error_in_includelet $arg $(msg)]$ch2
       }
       set adp_fn $(fn)
       #
@@ -1931,7 +1931,7 @@
       if {[llength $adp_args] % 2 == 1} {
         incr ::xowiki_inclusion_depth -1
         set adp $adp_args
-        return [my error_in_includelet $arg [_ xowiki.error-includelet-adp_syntax_invalid]]
+        return [my error_in_includelet $arg [_ xowiki.error-includelet-adp_syntax_invalid]]$ch2
       }
 
       lappend adp_args __including_page [self]
@@ -1942,7 +1942,7 @@
         set ::template::parse_level $including_page_level
         incr ::xowiki_inclusion_depth -1
         return [my error_in_includelet $arg \
-                    [_ xowiki.error-includelet-error_during_adp_evaluation]]
+                    [_ xowiki.error-includelet-error_during_adp_evaluation]]$ch2
       }
 
       return $page$ch2