X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Femailsettings.php;h=b35b4d28ee1a28c66b82e46454522c50332e5882;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=84be12675b868567fea3bac989a61f4b7e816579;hpb=afe3b1a268512efd48d14d840efae800d5d85129;p=quix0rs-gnu-social.git diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 84be12675b..b35b4d28ee 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -95,7 +95,7 @@ class EmailsettingsAction extends SettingsAction { _('Send me email when someone sends me a private message.'), $user->emailnotifymsg); common_checkbox('emailnotifynudge', - _('Send me an email when someone nudges me.'), + _('Allow friends to nudge me and send me an email.'), $user->emailnotifynudge); common_checkbox('emailpost', _('I want to post notices by email.'), @@ -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.');