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.1 -r1.200.2.2 --- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 26 Aug 2015 08:48:47 -0000 1.200.2.1 +++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 26 Aug 2015 08:58:27 -0000 1.200.2.2 @@ -681,7 +681,7 @@ set msg "No category tree with name '$name' found." } [my package_id] flush_page_fragment_cache -scope agg - set html "
$msg
" + set html "
[ns_quotehtml $msg]
" if {$edit_html ne ""} { return "$html Manage Categories? $edit_html" } @@ -731,7 +731,7 @@ #append content "
$edit_html
\n" if {!$no_tree_name} { - append content "

$my_tree_name $edit_html

" + append content "

[ns_quotehtml $my_tree_name] $edit_html

" } elseif {$edit_html ne ""} { append content "$edit_html
" } @@ -1193,7 +1193,7 @@ if {[info commands [$feed channel]] eq ""} { set detail "" if {[$feed exists errorMessage]} {set detail \n[$feed set errorMessage]} - return "No data available from $url
$detail" + return "No data available from $url
[ns_quotehtml $detail]" } else { set channel [$feed channel] #set html "

[ns_quotehtml [$channel title]]

" @@ -1453,7 +1453,7 @@ lassign [category::get_data $cat_id] category_id category_name tree_id tree_name #my log "--cat $cat_id $category_id $category_name $tree_id $tree_name" set label [ns_quotehtml "$category_name ($tree_name)"] - set entry "$label" + set entry "[ns_quotehtml $label]" if {$notification_type ne ""} { set notification_text "Subscribe category $category_name in tree $tree_name" set notifications_return_url [expr {[info exists return_url] ? $return_url : [ad_return_url]}] @@ -1495,7 +1495,7 @@ set gc_link [general_comments_create_link \ -object_name [$__including_page title] \ $item_id $gc_return_url] - set gc_link

$gc_link

+ set gc_link

[ns_quotehtml $gc_link]

} else { set gc_link "" } @@ -1758,14 +1758,16 @@ -mode_3_fmt "%d %b %Y, at %X"] set name [::xo::get_user_name $user_id] - append output "$name$pretty_time\n" + append output [subst {[ns_quotehtml $name] + [ns_quotehtml $pretty_time] + }] } - if {$output ne ""} {set output "$output
\n"} + if {$output ne ""} {set output "$output
\n"} } set users [expr {$count == 0 ? "No registered users" : $count == 1 ? "1 registered user" : "$count registered users"}] - return "
$users$what$when
$output" + return "
[ns_quotehtml $users$what$when]
$output" } } @@ -2362,7 +2364,7 @@ } append output "" \ "
" [join $menu " "] "
" \ - "$page_order $title
" \ + "[ns_quotehtml $page_order $title]" \ $content } return $output @@ -2459,7 +2461,7 @@ } append output \ "" $menu \ - "$page_order $title" \ + "[ns_quotehtml $page_order $title]" \ $content } @@ -3129,7 +3131,7 @@ lassign $p edge weight width lassign [split $edge ,] a b #my log "--G $a -> $b check $c > $max_edges, $weight < $cutoff" - if {[incr c]>$max_edges} break + if {[incr c] > $max_edges} break if {$weight < $cutoff} continue append edgesHTML "g.addEdge(\$('$a'), \$('$b'), $weight, 0, $width);\n" }