Index: openacs-4/packages/calendar/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/index.tcl,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/calendar/www/admin/index.tcl 9 May 2018 15:33:29 -0000 1.11 +++ openacs-4/packages/calendar/www/admin/index.tcl 1 Mar 2019 11:03:03 -0000 1.11.2.1 @@ -44,7 +44,7 @@ } type { label {Type} - display_eval {[ad_decode $private_p "t" "Personal" "Shared"]} + display_eval {[expr {$private_p ? "Personal" : "Shared"}]} } num_items { label "Items" Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v diff -u -r1.234.2.1 -r1.234.2.2 --- openacs-4/packages/dotlrn/tcl/community-procs.tcl 14 Feb 2019 16:15:01 -0000 1.234.2.1 +++ openacs-4/packages/dotlrn/tcl/community-procs.tcl 1 Mar 2019 11:04:53 -0000 1.234.2.2 @@ -99,7 +99,7 @@ set package_id [site_node::instantiate_and_mount \ -parent_node_id $parent_node_id \ - -node_name [ad_decode $url_part "" $community_type_key $url_part] \ + -node_name [expr {$url_part eq "" ? $community_type_key : $url_part}] \ -package_name $pretty_name \ -package_key [one_community_type_package_key] \ -context_id $parent_node(object_id)] Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v diff -u -r1.86 -r1.86.2.1 --- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 18 Sep 2018 17:27:14 -0000 1.86 +++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl 1 Mar 2019 11:08:07 -0000 1.86.2.1 @@ -66,7 +66,7 @@ ad_proc -public is_instantiated {} { returns 1 if dotlrn is instantiated, 0 otherwise } { - return [ad_decode [apm_num_instances [package_key]] 0 0 1] + return [expr {[apm_num_instances [package_key]] > 0}] } ad_proc -public is_initialized {} { @@ -120,7 +120,9 @@ } { mount a package under dotlrn } { - set parent_node_id [ad_decode $parent_node_id "" [get_node_id] $parent_node_id] + if {$parent_node_id eq ""} { + set parent_node_id [get_node_id] + } db_transaction { array set parent_node [site_node::get -node_id $parent_node_id]