From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 9 Dec 2008 08:27:50 +0000 (-0500)
Subject: fix registration bug - fatal error when sending email confirmation
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=792cb7a5358c4b7f80b124d5a80c625a7d4d89ea;p=quix0rs-gnu-social.git

fix registration bug - fatal error when sending email confirmation

darcs-hash:20081209082750-7b5ce-6d06a7b1cda2a9afb6ce8ea64d65df81cc063139.gz
---

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 61e59e4db1..b35b4d28ee 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -229,9 +229,7 @@ class EmailsettingsAction extends SettingsAction {
 			return;
 		}
 
-		mail_confirm_address($confirm->code,
-							 $user->nickname,
-							 $email);
+		mail_confirm_address($user, $confirm->code, $user->nickname, $email);
 
 		$msg = _('A confirmation code was sent to the email address you added. Check your inbox (and spam box!) for the code and instructions on how to use it.');
 
diff --git a/classes/User.php b/classes/User.php
index 7ac975007c..11b010a836 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -263,9 +263,7 @@ class User extends Memcached_DataObject
 		$profile->query('COMMIT');
 
 		if ($email && !$user->email) {
-			mail_confirm_address($confirm->code,
-								 $profile->nickname,
-								 $email);
+			mail_confirm_address($user, $confirm->code, $profile->nickname, $email);
 		}
 
 		return $user;
diff --git a/lib/mail.php b/lib/mail.php
index e627730a7a..313040ca25 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -85,8 +85,8 @@ function mail_to_user(&$user, $subject, $body, $address=NULL) {
 
 # For confirming a Jabber address
 
-function mail_confirm_address($code, $nickname, $address) {
-    $user = common_current_user();
+function mail_confirm_address($user, $code, $nickname, $address) {
+
 	$subject = _('Email address confirmation');
 
     $body = sprintf(_("Hey, %s.\n\nSomeone just entered this email address on %s.\n\n" .