Commit 6edad2c5 authored by Adam Shepherd's avatar Adam Shepherd
Browse files

Issue #3294459 by AdamPS: Current user is incorrect during sending emails

parent 401a8a52

src/Address.php

+3 −0
Changes for src/Address.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ class Address implements AddressInterface { 
        $site_mail = $site_config->get('mail') ?: ini_get('sendmail_from');

        return new static($site_mail, $site_config->get('name'));

      }

      elseif ($user = user_load_by_mail($address)) {

        return static::create($user);

      }

      else {

        return new static($address);

      }

src/MailerHelper.php

+1 −1
Changes for src/MailerHelper.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ class MailerHelper implements MailerHelperInterface { 
      if ($value == $site_mail) {

        $value = '<site>';

      }

      elseif ($user = user_load_by_mail($value)) {

      elseif ($user = $address->getAccount()) {

        $value = $user->id();

      }

      else {