Index: openacs-4/packages/acs-templating/tcl/tab-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/tab-procs.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-templating/tcl/tab-procs.tcl 10 Jan 2007 21:22:12 -0000 1.5 +++ openacs-4/packages/acs-templating/tcl/tab-procs.tcl 27 Oct 2014 16:40:12 -0000 1.6 @@ -61,7 +61,7 @@ } { Dispatch procedure for tabstrip. } { - eval template::tabstrip::$command $args + template::tabstrip::$command {*}$args } # Create a new tabbed page @@ -79,22 +79,22 @@ set code [list template::form create $dlg_name] # Determine cookie name - if { [template::util::is_nil opts(cookie_name)] } { + if { ![info exists opts(cookie_name)] } { set cookie_name $dlg_name } else { set cookie_name $opts(cookie_name) } lappend code -cookie_name $cookie_name - eval $code $args + {*}$code {*}$args # Determine the current tab set level [template::adp_level] upvar #$level $dlg_name:properties form_properties # Check parameters - if { ![template::util::is_nil opts(current_tab)] } { + if { [info exists opts(current_tab)] } { set current_tab $opts(current_tab) } else { # Check http @@ -140,8 +140,8 @@ # Set tab-specific params - if { [template::util::is_nil opts(base_url)] } { - if { ![template::util::is_nil properties(base_url)] } { + if { ![info exists opts(base_url)] } { + if { [info exists properties(base_url)] } { # use global base_url lappend code -base_url $properties(base_url) } else { @@ -158,12 +158,12 @@ lappend code -current 0 } - eval "$code $args" + {*}$code {*}$args upvar #$level $dlg_name:$name element # If this is the first tab being added, set it as current - if { [template::util::is_nil properties(current_tab)] } { + if { ![info exists properties(current_tab)] } { set_current_tab $dlg_name [lindex $properties(element_names) 0] 3 }