Index: openacs-4/packages/xowiki/tcl/category-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/category-procs.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/xowiki/tcl/category-procs.tcl	12 Aug 2013 19:46:49 -0000	1.26
+++ openacs-4/packages/xowiki/tcl/category-procs.tcl	27 Oct 2014 16:42:04 -0000	1.27
@@ -20,13 +20,13 @@
     # Return matched category trees matching the specified names (or all)
 
     # provide compatibility with earlier versions of categories
-    set have_locale [expr {[lsearch [info args category_tree::get_mapped_trees] locale] > -1}]
+    set have_locale [expr {"locale" in [info args category_tree::get_mapped_trees]}]
     set mapped_trees [expr {$have_locale ?
                             [category_tree::get_mapped_trees $object_id $locale] :
                             [category_tree::get_mapped_trees $object_id]}]
     set trees [list]
     foreach tree $mapped_trees {
-      foreach {tree_id my_tree_name ...} $tree {break}
+      lassign $tree tree_id my_tree_name ...
 
       # "names" is a list of category names
       if {$names ne ""} {
@@ -49,7 +49,7 @@
       }
       # Get the values from info in "tree" into separate variables given by output.
       # Note, that the order matters!
-      foreach $output $tree break
+      lassign $tree {*}$output
       set l [list]
       foreach __var $output {lappend l [set $__var]}
       lappend trees $l