Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes

[quix0rs-gnu-social.git] / classes / User.php

diff --git a/classes/User.php b/classes/User.php
index 26225916f1e70cee2a0f261a245b475d737210fb..c9c61d3aed40606267eb5e6268b624b91e39a1c4 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -384,8 +384,7 @@ class User extends Managed_DataObject
 
             if (!empty($email) && empty($user->email)) {
                 try {
-                    require_once(INSTALLDIR . '/lib/mail.php');
-                    mail_confirm_address($user, $confirm->code, $profile->getNickname(), $email);
+                    $confirm->sendConfirmation();
                 } catch (EmailException $e) {
                     common_log(LOG_ERR, "Could not send user registration email for user id=={$profile->getID()}: {$e->getMessage()}");
                     if (!$accept_email_fail) {