diff options
| author | Andrew Dolgov <[email protected]> | 2021-03-17 19:50:04 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2021-03-17 19:50:04 +0300 |
| commit | 43ea36d030a1880b3309ea46e6da8cc207d5ec0e (patch) | |
| tree | 952d593c5a0a3e0055c57bceea314d57f0c5d521 /classes/pref | |
| parent | ce9955c6ff3964c58fdd370cf599fce35c35b99b (diff) | |
prefs: allow setting email if it was previously blank
Diffstat (limited to 'classes/pref')
| -rw-r--r-- | classes/pref/prefs.php | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 1d61059cb..512e31453 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -231,29 +231,29 @@ class Pref_Prefs extends Handler_Protected { if ($user) { $user->full_name = clean($_POST['full_name']); - if ($user->email != $new_email) + if ($user->email != $new_email) { Logger::log(E_USER_NOTICE, "Email address of user ".$user->login." has been changed to ${new_email}."); - if ($user->email && $user->email != $new_email) { + if ($user->email) { + $mailer = new Mailer(); - $mailer = new Mailer(); - - $tpl = new Templator(); + $tpl = new Templator(); - $tpl->readTemplateFromFile("mail_change_template.txt"); + $tpl->readTemplateFromFile("mail_change_template.txt"); - $tpl->setVariable('LOGIN', $user->login); - $tpl->setVariable('NEWMAIL', $new_email); - $tpl->setVariable('TTRSS_HOST', Config::get(Config::SELF_URL_PATH)); + $tpl->setVariable('LOGIN', $user->login); + $tpl->setVariable('NEWMAIL', $new_email); + $tpl->setVariable('TTRSS_HOST', Config::get(Config::SELF_URL_PATH)); - $tpl->addBlock('message'); + $tpl->addBlock('message'); - $tpl->generateOutputToString($message); + $tpl->generateOutputToString($message); - $mailer->mail(["to_name" => $user->login, - "to_address" => $user->email, - "subject" => "[tt-rss] Email address change notification", - "message" => $message]); + $mailer->mail(["to_name" => $user->login, + "to_address" => $user->email, + "subject" => "[tt-rss] Email address change notification", + "message" => $message]); + } $user->email = $new_email; } |