Index: openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.tcl 17 May 2003 10:04:18 -0000 1.7 +++ openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.tcl 10 Mar 2004 16:26:46 -0000 1.8 @@ -37,7 +37,7 @@ Returns 1 if the acs is properly installed, 0 otherwise. } { if { ![db_table_exists apm_packages] || ![db_table_exists site_nodes] } { - ad_proc util_memoize {script {max_age ""}} {no cache} {eval $script} + proc util_memoize {script {max_age ""}} {eval $script} return 0 } set kernel_install_p [apm_package_installed_p acs-kernel] @@ -49,7 +49,7 @@ if { $kernel_install_p && $admin_exists_p} { return 1 } else { - ad_proc util_memoize {script {max_age ""}} {no cache} {eval $script} + proc util_memoize {script {max_age ""}} {eval $script} return 0 } } 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.62 -r1.63 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 22 Jan 2004 14:01:25 -0000 1.62 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 10 Mar 2004 16:26:46 -0000 1.63 @@ -1071,11 +1071,9 @@ return [db_string acs_kernel_id_get {} -default 0] } -ad_proc -public ad_acs_kernel_id {} { - - Returns the package_id of the kernel. - -} { +# use proc rather than ad_proc since we redefine this internally +# and dont want a redefined proc error... +proc ad_acs_kernel_id {} { set acs_kernel_id [ad_acs_kernel_id_mem] ad_proc -public ad_acs_kernel_id {} {Returns the package_id of the kernel.} "return $acs_kernel_id" return $acs_kernel_id