Index: openacs-4/packages/acs-tcl/tcl/defs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/defs-procs.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	14 Aug 2003 20:38:03 -0000	1.26
+++ openacs-4/packages/acs-tcl/tcl/defs-procs.tcl	28 Aug 2003 09:41:43 -0000	1.27
@@ -5,7 +5,7 @@
 
     @author Many others at ArsDigita and in the OpenACS community.
     @creation-date 2 April 1998
-    @cvs-id $Id$
+    @cvs-id defs-procs.tcl,v 1.19.2.2 2003/03/28 13:43:28 lars Exp
 }
 
 ad_proc ad_acs_version {} {
@@ -186,8 +186,7 @@
 } {
     @return the url for the community member admin page of a particular user
 } {
-    return "[subsite::get_element -element url -notrailing][ad_parameter \
-	    -package_id [ad_acs_kernel_id] CommunityMemberAdminURL]?[export_vars user_id]"
+    return [export_vars -base [parameter::get -package_id [ad_acs_kernel_id] -parameter CommunityMemberAdminURL] { user_id }]
 }
 
 ad_proc -public acs_community_member_admin_link {
@@ -289,7 +288,7 @@
     and then closes the BODY and HTML tags
 } {
     global sidegraphic_displayed_p
-    if [empty_string_p $signatory] {
+    if { [empty_string_p $signatory] } {
 	set signatory [ad_system_owner]
     } 
     if { [info exists sidegraphic_displayed_p] && $sidegraphic_displayed_p } {
@@ -562,9 +561,9 @@
     @author Roberto Mello
 } {
     set lines [list]
-    if [empty_string_p $line2] {
+    if { [empty_string_p $line2] } {
 	lappend lines $line1
-    } elseif [empty_string_p $line1] {
+    } elseif { [empty_string_p $line1] } {
 	lappend lines $line2
     } else {
 	lappend lines $line1
@@ -588,14 +587,14 @@
 } {
     uplevel {
 	set user_id [ad_conn user_id]
-	if [catch {
+	if { [catch {
 	    db_1row user_name_select {
 		select first_names, last_name, email
 		from persons, parties
 		where person_id = :user_id
 		and person_id = party_id
 	    }
-	} errmsg] {
+	} errmsg] } {
 	    ad_return_error "Couldn't find user info" "Couldn't find user info."
 	    return
 	}
@@ -613,7 +612,7 @@
     string, ad_decorate_top will make a one-row table for the 
     top of the page
 } {
-    if [empty_string_p $potential_decoration] {
+    if { [empty_string_p $potential_decoration] } {
 	return $simple_headline
     } else {
 	return "<table cellspacing=10><tr><td>$potential_decoration<td>$simple_headline</tr></table>"