Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v diff -u -r1.105 -r1.106 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 15 May 2011 16:43:24 -0000 1.105 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 5 Oct 2012 21:33:27 -0000 1.106 @@ -1542,17 +1542,19 @@ if {[ns_info name] eq "NaviServer"} { # this is written for NaviServer 4.99.1 or newer foreach filter {rp_filter rp_resources_filter request_denied_filter} { - if {[info command ::${filter}_aolserver] eq ""} { - rename $filter ${filter}_aolserver - } - proc $filter {why} [list ${filter}_aolserver \$why ] + set cmd ${filter}_aolserver + if {[info command $cmd] ne ""} {rename $cmd ""} + rename $filter $cmd + proc $filter {why} "$cmd \$why" } - if {[info command rp_invoke_filter_conn] eq ""} { - rename rp_invoke_filter rp_invoke_filter_conn - rename rp_invoke_proc rp_invoke_proc_conn - } - proc rp_invoke_filter { why filter_info} { rp_invoke_filter_conn _ $filter_info $why} - proc rp_invoke_proc { argv } { rp_invoke_proc_conn _ $argv } - + set cmd rp_invoke_filter_conn + if {[info command $cmd] ne ""} {rename $cmd ""} + rename rp_invoke_filter $cmd + proc rp_invoke_filter { why filter_info} "$cmd _ \$filter_info \$why" + + set cmd rp_invoke_proc_conn + if {[info command $cmd] ne ""} {rename $cmd ""} + rename rp_invoke_proc $cmd + proc rp_invoke_proc { argv } "$cmd _ \$argv" }