Index: openacs-4/packages/dotlrn/lib/member-email-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/member-email-confirm.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/dotlrn/lib/member-email-confirm.tcl	27 Oct 2014 16:41:14 -0000	1.6
+++ openacs-4/packages/dotlrn/lib/member-email-confirm.tcl	7 Aug 2017 23:48:08 -0000	1.7
@@ -4,7 +4,7 @@
 } {
     user_id:naturalnum,notnull
     {type "on join"}
-    {return_url ""}
+    {return_url:localurl ""}
 }
 
 permission::require_permission \
@@ -30,7 +30,7 @@
         if {![db_0or1row member_email {}]} {
 	    set default_email [lindex [callback dotlrn::default_member_email -community_id $community_id -type $type -var_list [list course_name $community_name community_name $community_name]] 0]
 	    if {![llength $default_email]} {
-		set from_addr [cc_email_from_party [ad_conn user_id]]
+		set from_addr [party::email -party_id [ad_conn user_id]]
 		set subject "Welcome to ${community_name}!"
 	    }
 	    set from_addr [lindex $default_email 0]
@@ -45,7 +45,7 @@
  	    set email [_ dotlrn.added_community_message]
 	}
 	if {$from_addr eq ""} {
-	    set from_addr [cc_email_from_party [ad_conn user_id]]
+	    set from_addr [party::email -party_id [ad_conn user_id]]
 	}
         set email [template::util::richtext::create $email text/html]
     } -on_submit {
@@ -76,3 +76,9 @@
 ad_return_template
 
 
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: