Index: openacs-4/packages/acs-subsite/lib/user-info.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.tcl,v diff -u -N -r1.25 -r1.26 --- openacs-4/packages/acs-subsite/lib/user-info.tcl 17 Jul 2018 11:09:34 -0000 1.25 +++ openacs-4/packages/acs-subsite/lib/user-info.tcl 17 Jul 2018 11:10:49 -0000 1.26 @@ -1,5 +1,5 @@ # -# Expects: +# Expects: # user_id:naturalnum,optional # return_url:optional # edit_p:optional @@ -152,7 +152,7 @@ } set focus "user_info.$first_element" -# +# ad_form -extend -name user_info -form $elms_list -on_request { foreach var { authority_id first_names last_name email username screen_name url bio } { set $var $user($var) @@ -198,20 +198,20 @@ if { [llength $result(element_messages)] == 0 } { form set_error user_info $first_element $result(update_message) } - + # Element messages foreach { elm_name elm_error } $result(element_messages) { form set_error user_info $elm_name $elm_error } break } } - + } -after_submit { if {[ad_conn account_status] eq "closed"} { auth::verify_account_status } - + ad_returnredirect $return_url ad_script_abort } @@ -220,16 +220,16 @@ if { ![form is_valid user_info] } { element set_properties user_info email \ -display_value "[element get_value user_info email]" - + set url [element get_value user_info url] if { ![string match -nocase "http://*" $url] && ![string match -nocase "https://*" $url] } { element set_properties user_info url \ -display_value "$url" } else { - element set_properties user_info url -display_value \ - "$url" + element set_properties user_info url -display_value \ + "$url" } } Index: openacs-4/packages/acs-subsite/www/group-leave.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-leave.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/group-leave.tcl 17 Jul 2018 11:09:34 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/group-leave.tcl 17 Jul 2018 11:10:49 -0000 1.7 @@ -1,6 +1,6 @@ ad_page_contract { Leave the group - + @author Lars Pind (lars@collaboraid.biz) @creation-date 2003-08-07 @cvs-id $Id$ @@ -22,10 +22,10 @@ -object_id_two $user_id] db_transaction { - relation_remove $rel_id + relation_remove $rel_id } on_error { - ad_return_error "Error creating the relation" "We got the following error while trying to remove the relation:
$errmsg
" - ad_script_abort + ad_return_error "Error creating the relation" "We got the following error while trying to remove the relation:
$errmsg
" + ad_script_abort } }