Invite -> Invitation

darcs-hash:20080827010515-84dde-f4dd776209a0aa4f6a7e9d6ac1de46d83ff54650.gz

diff --git a/classes/User.php b/classes/User.php
index cdb6568f0cb7060f10e69174d74e7043a08cdbec..99ae40baf8aafb6d34a1298f9da5143b5697dbc9 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -200,8 +200,8 @@ class User extends DB_DataObject
                # Users who respond to invite email have proven their ownership of that address
 
                if ($code) {
-                       $invite = Invite::staticGet($code);
-                       if ($invite && $invite->address && $invite->address_type == 'email') {
+                       $invite = Invitation::staticGet($code);
+                       if ($invite && $invite->address && $invite->address_type == 'email' && $invite->address == $email) {
                                $user->email = $invite->address;
                        }
                }
@@ -230,7 +230,7 @@ class User extends DB_DataObject
                        return FALSE;
                }
 
-               if ($email && !$code) {
+               if ($email && !$user->email) {
 
                        $confirm = new Confirm_address();
                        $confirm->code = common_confirmation_code(128);
@@ -251,7 +251,7 @@ class User extends DB_DataObject
 
                $profile->query('COMMIT');
 
-               if ($email && !$code) {
+               if ($email && !$user->email) {
                        mail_confirm_address($confirm->code,
                                                                 $profile->nickname,
                                                                 $email);