back out my change to the link format; see if it helps

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

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 4fb1c17099b26d75d0a9dad7f6f758bdde45ae88..b7e356c25683a6171298090ed729b91a17707a00 100644 (file)
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
-class ImsettingsAction extends SettingsAction {
+class EmailsettingsAction extends SettingsAction {
 
        function get_instructions() {
                return _('Manage how you get email from %%site.name%%.');
@@ -142,7 +142,7 @@ class ImsettingsAction extends SettingsAction {
                        return;
                }
 
-               $email = common_normalize_email($email);
+               $email = common_canonical_email($email);
 
                if (!$email) {
                    $this->show_form(_('Cannot normalize that email address'));
@@ -173,6 +173,10 @@ class ImsettingsAction extends SettingsAction {
                        return;
                }
 
+               mail_confirm_address($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.');
 
                $this->show_form($msg, TRUE);