Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v diff -u -r1.49 -r1.50 --- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 31 Oct 2008 02:01:30 -0000 1.49 +++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 31 Oct 2008 14:39:55 -0000 1.50 @@ -495,21 +495,20 @@ } } - proc ::xowiki::tidy args {eval ::xowiki::Tidy clean $args} - - Object create Tidy - Tidy proc clean {text} { - if {[[::xo::cc package_id] get_parameter tidy 0]} { + Object create tidy + tidy proc clean {text} { + if {[[::xo::cc package_id] get_parameter tidy 0] + && [info command ::util::which] ne ""} { set tidycmd [::util::which tidy] if {$tidycmd ne ""} { set in_file [ns_tmpnam] ::xowiki::write_file $in_file $text catch {exec $tidycmd -q -w 0 -ashtml < $in_file 2> /dev/null} output file delete $in_file #my msg o=$output - regexp \n(.*)\n $output _ output - #my msg o=$output - return $output + regexp \n(.*)\n $output _ text + #my msg o=$text + return $text } } return $text