Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 2 Sep 2003 14:20:43 -0000 1.17 +++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 3 Sep 2003 19:46:03 -0000 1.18 @@ -541,6 +541,8 @@ } ad_proc -public ad_get_login_url { + -authority_id + -username -return:boolean } { @@ -568,10 +570,23 @@ append url "register/" + set export_vars [list] + if { [exists_and_not_null authority_id] } { + lappend export_vars authority_id + + } + if { [exists_and_not_null username] } { + lappend export_vars username + + } if { $return_p } { - set url [export_vars -base $url { { return_url [ad_return_url] } }] + lappend export_vars { return_url [ad_return_url] } } + if { [llength $export_vars] > 0 } { + set url [export_vars -base $url $export_vars] + } + return $url }