Index: openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl,v diff -u -N -r1.38 -r1.39 --- openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 13 Feb 2009 20:12:26 -0000 1.38 +++ openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 30 Oct 2010 21:43:01 -0000 1.39 @@ -907,7 +907,7 @@ @param object_id the target, it is the first arg to the method @param args the remaining arguments } { - return [apply ${method_name}__[util_memoize "acs_object_type $object_id"] [concat $object_id $args]] + return [ad_apply ${method_name}__[util_memoize "acs_object_type $object_id"] [concat $object_id $args]] } ad_proc -public ad_dispatch { @@ -925,7 +925,7 @@ @param object_id the target, it is the first arg to the method @param args the remaining arguments } { - return [apply ${method_name}__$type $args] + return [ad_apply ${method_name}__$type $args] } ad_proc -public ad_assert_arg_value_in_list { Index: openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl,v diff -u -N -r1.23 -r1.24 --- openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl 10 Jan 2007 21:22:05 -0000 1.23 +++ openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl 30 Oct 2010 21:43:01 -0000 1.24 @@ -255,7 +255,7 @@ set proc_name [acs_sc_generate_name $contract $impl $operation] if { [llength [info procs $proc_name]] == 1 } { - return [apply $proc_name $arguments] + return [ad_apply $proc_name $arguments] } else { if { $error_p } { error "Operation $operation is not implemented in '$impl' implementation of contract '$contract'" Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v diff -u -N -r1.126 -r1.127 --- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 15 Oct 2010 11:48:36 -0000 1.126 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 30 Oct 2010 21:43:01 -0000 1.127 @@ -1853,7 +1853,7 @@ } } -ad_proc -public apply {func arglist} { +ad_proc -public ad_apply {func arglist} { Evaluates the first argument with ARGLIST as its arguments, in the environment of its caller. Analogous to the Lisp function of the same name. } { @@ -1870,7 +1870,7 @@ return -code error "Unsafe argument to safe_eval: $arg" } } - return [apply uplevel $args] + return [ad_apply uplevel $args] } ad_proc -public lmap {list proc_name} { Index: openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl,v diff -u -N -r1.18 -r1.19 --- openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl 15 May 2007 20:14:53 -0000 1.18 +++ openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl 30 Oct 2010 21:43:01 -0000 1.19 @@ -53,7 +53,7 @@ set $name $val } } - set xml [apply rss_gen $args] + set xml [ad_apply rss_gen $args] # Write report. set report_file [rss_gen_report_file -summary_context_id $summary_context_id -impl_name $impl_name -assert]