Index: openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl,v diff -u -N -r1.15 -r1.16 --- openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl 30 Mar 2005 00:36:12 -0000 1.15 +++ openacs-4/packages/acs-tcl/tcl/parameter-procs.tcl 10 Jan 2007 21:22:12 -0000 1.16 @@ -38,7 +38,7 @@ @param parameter which parameter's value to set @param value what value to set said parameter to } { - if {[empty_string_p $package_id]} { + if {$package_id eq ""} { set package_id [ad_requested_object_id] } @@ -66,13 +66,13 @@ @return The string trimmed (leading and trailing spaces removed) parameter value } { - if {[empty_string_p $package_id]} { + if {$package_id eq ""} { set package_id [ad_requested_object_id] } set package_key "" set value "" - if {![empty_string_p $package_id]} { + if {$package_id ne ""} { # This can fail at server startup--OpenACS calls parameter::get to # get the size of the util_memoize cache so it can setup the cache. # apm_package_key_from_id needs that cache, but on server start @@ -86,16 +86,16 @@ # If I convert the package_id to a package_key, is there a parameter by this # name in the parameter file? If so, it takes precedence. # 1. use the parameter file - if {![empty_string_p $package_key]} { + if {$package_key ne ""} { set value [ad_parameter_from_file $parameter $package_key] } # 2. check the parameter cache - if {[empty_string_p $value]} { + if {$value eq ""} { set value [ad_parameter_cache $package_id $parameter] } # 3. use the default value - if {[empty_string_p $value]} { + if {$value eq ""} { set value $default } @@ -164,7 +164,7 @@ # 2. try to get a package_id for this package_key and use the standard # parameter::get function to get the value - if {[empty_string_p $value]} { + if {$value eq ""} { with_catch errmsg { set value [parameter::get \ -localize=$localize_p \