Index: openacs-4/packages/xowiki/tcl/syndicate-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/syndicate-procs.tcl,v diff -u -r1.21 -r1.22 --- openacs-4/packages/xowiki/tcl/syndicate-procs.tcl 28 Sep 2007 11:54:13 -0000 1.21 +++ openacs-4/packages/xowiki/tcl/syndicate-procs.tcl 11 Oct 2007 07:47:59 -0000 1.22 @@ -53,7 +53,7 @@ set filler [expr {[string first firefox $user_agent] >- 1 ? "" : "" }] - set css_link [expr {[string match /* $css] ? $css : "/resources/xowiki/$css"}] + set css_link [expr {[string match "/*" $css] ? $css : "/resources/xowiki/$css"}] return "\n\n$filler" } return "" Index: openacs-4/packages/xowiki/tcl/template-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/template-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/xowiki/tcl/template-procs.tcl 23 Sep 2006 10:39:05 -0000 1.1 +++ openacs-4/packages/xowiki/tcl/template-procs.tcl 11 Oct 2007 07:48:00 -0000 1.2 @@ -41,7 +41,7 @@ # set the stack frame at which the template is being parsed so that # other procedures can reference variables cleanly variable parse_level - lappend parse_level [expr [info level] - $uplevel] + lappend parse_level [expr {[info level] - $uplevel}] set __adp_out [template::adp_parse [template::util::url_to_file $src] $varlist] 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.174 -r1.175 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 28 Sep 2007 20:34:06 -0000 1.174 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 11 Oct 2007 07:48:00 -0000 1.175 @@ -580,8 +580,8 @@ Page instproc div {ch arg} { if {$arg eq "content"} { return "$ch
" - } elseif {[string match left-col* $arg] \ - || [string match right-col* $arg] \ + } elseif {[string match "left-col*" $arg] \ + || [string match "right-col*" $arg] \ || $arg eq "sidebar"} { return "$ch
" } elseif {$arg eq "box"} {