Merge branch 'nightly' into 'nightly'

[quix0rs-gnu-social.git] / actions / emailsettings.php

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 7384b3630d3a080debf6379148297aa4bf4b7ccb..b5933fdb6515c7db7444cfeeae281b572511e691 100644 (file)
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -369,8 +369,7 @@ class EmailsettingsAction extends SettingsAction
                 throw new ServerException(_('Could not insert confirmation code.'));
             }
 
-            common_debug('Sending confirmation address for user '.$user->getID().' to email '.$email);
-            mail_confirm_address($user, $confirm->code, $user->getNickname(), $email);
+            $confirm->sendConfirmation();
 
             Event::handle('EndAddEmailAddress', array($user, $email));
         }