Index: openacs-4/packages/xowiki/tcl/menu-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/menu-procs.tcl,v diff -u -r1.19.2.7 -r1.19.2.8 --- openacs-4/packages/xowiki/tcl/menu-procs.tcl 14 Feb 2020 11:02:59 -0000 1.19.2.7 +++ openacs-4/packages/xowiki/tcl/menu-procs.tcl 24 Aug 2020 23:33:41 -0000 1.19.2.8 @@ -133,21 +133,11 @@ {parent_id ""} } - if {[info commands ::dict] ne ""} { - ::xowiki::MenuBar instproc get_prop {dict key {default ""}} { - if {![dict exists $dict $key]} { - return $default - } - return [dict get $dict $key] + ::xowiki::MenuBar instproc get_prop {dict key {default ""}} { + if {![dict exists $dict $key]} { + return $default } - } else { - ::xowiki::MenuBar instproc get_prop {dict key {default ""}} { - array set "" $dict - if {![info exists ($key)]} { - return $default - } - return [set ($key)] - } + return [dict get $dict $key] } ::xowiki::MenuBar instproc init {} { @@ -174,8 +164,7 @@ } ::xowiki::MenuBar instproc clear_menu {-menu:required} { - array set "" [set :Menu($menu)] - set :Menu($menu) [list label $(label)] + set :Menu($menu) [list label [dict get $:Menu($menu) label]] } ::xowiki::MenuBar instproc current_folder {} { @@ -224,9 +213,7 @@ # provide a default label # regsub -all {[.]} $full_name - full_name - array set "" [list label "#xowiki.menu-$full_name#" group $group_name] - array set "" $item - set item [array get ""] + set item [dict merge [list label "#xowiki.menu-$full_name#" group $group_name] $item] # # If an entry with the given name exists, update it. Otherwise add @@ -262,8 +249,13 @@ ::xowiki::MenuBar instproc update_items { - -package_id:required -nls_language:required -parent_id:required - -return_url -autoname -template_file items + -package_id:required + -nls_language:required + -parent_id:required + -return_url + -autoname + -template_file + items } { # A folder page can contain extra menu entries (sample # below). Iterate of the extra_menu property and add according