Currently, if the password reset mail fails in user_pass_submit the user gets these two conflicting messages:

Unable to send e-mail. Please contact the site administrator if the problem persists.

Further instructions have been sent to your e-mail address.

Since _user_mail_notify provides a return value, we should check that before we print the second message.

Patch attached.

CommentFileSizeAuthor
#3 user_pass_submit_message.patch1.01 KBArtusamak
user_pass_submit_message.patch1023 bytesmsonnabaum
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

agentrickard’s picture

agentrickard
he/him
Primary language English
Location Georgia (US)
CreditAttribution: agentrickard commented
Status: Active » Needs review

Looks sane. Passing to testbed.

Status: Needs review » Needs work

The last submitted patch, user_pass_submit_message.patch, failed testing.

Artusamak’s picture

Artusamak
he/him
Primary language French
Location Bzh
CreditAttribution: Artusamak commented
Status: Needs work » Reviewed & tested by the community
FileSize
user_pass_submit_message.patch1.01 KB

You patch is misformatted, you now have to generate it with the prefix, that's why your patch failed to pass the testbost.
Here is the attachment of the fixed patch (which is working great).

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
CreditAttribution: webchick commented
Version: 7.x-dev » 8.x-dev
Status: Reviewed & tested by the community » Fixed
Issue tags: +Needs backport to D7

Makes sense.

Committed and pushed to 8.x and 7.x. Thanks!

Status: Fixed » Closed (fixed)
Issue tags: -Needs backport to D7

Automatically closed -- issue fixed for 2 weeks with no activity.

Issue tags: +Needs backport to D7

Restoring issue tags, see #2125755: System messages removed all issue tags during D7 upgrade.