Skip to content

Use wp_lostpassword_url() for the compromised-password reset links - #1047

Open
chubes4 wants to merge 1 commit into
WordPress:masterfrom
chubes4:fix/lostpassword-url
Open

chubes4 wants to merge 1 commit into
WordPress:masterfrom
chubes4:fix/lostpassword-url

Conversation

@chubes4

@chubes4 chubes4 commented Nov 17, 2026 •

Copy link
Copy Markdown

What?

Builds the "create a new password" link in the compromised-password login notice and the user email from wp_lostpassword_url(), instead of add_query_arg( 'action', 'lostpassword', wp_login_url() ).

Related to #1039 / #1046. This is not a duplicate: #1046 lets sites replace these emails, while this makes the default link correct.

Why?

wp_lostpassword_url() is how core builds this link (it's what wp-login.php's own "Lost your password?" uses), and it runs through the lostpassword_url filter. WooCommerce My Account and most membership plugins hook that filter to point at their own lost-password page.

Building the URL from wp_login_url() skips that filter. On those sites, a user locked out by the failed-attempt reset is sent from the notice and from the email to the stock wp-login.php?action=lostpassword form. That's a page those users may never have seen, and some sites disable or redirect it.

With this change, sites that customize their lost-password URL get the right link with no Two Factor-specific code. Sites that don't keep the same wp-login.php?action=lostpassword destination. The one difference: on a site that filters only login_url and not lostpassword_url, the link now goes to core's default lost-password URL. That's the same URL core itself links to.

How?

  • Two_Factor_Core::maybe_show_reset_password_notice(): esc_url( wp_lostpassword_url() ).
  • Two_Factor_Core::notify_user_password_reset(): esc_url( wp_lostpassword_url() ).
  • Tests: both now honor a lostpassword_url filter, and the email no longer contains wp-login.php when the filter is set.

Use of AI Tools

AI assistance: Yes
Tool(s): Claude Code (Extra Chill Bot)
Model(s): Claude
Used for: Found this while auditing every place an Extra Chill member could land on a stock wp-login.php screen. The agent wrote the change and tests; I reviewed them.

Testing Instructions

  1. npm run test (single site and multisite), or npm run composer -- test -- --filter 'lost_password_url'.
  2. Manual: add add_filter( 'lostpassword_url', fn() => home_url( '/my-account/lost-password/' ) );, set _two_factor_password_was_reset on a user, and try logging in with a wrong password. The notice's "create a new password" link goes to /my-account/lost-password/. The email sent by Two_Factor_Core::notify_user_password_reset() uses the same URL.

Ran in wp-env (PHP 7.4): composer test-single OK (363 tests, 1330 assertions), composer test-multisite OK (363 tests), phpcs clean on the changed files.

Changelog Entry

Fixed - Compromised-password notice and email now link to the site's lost password URL (wp_lostpassword_url()), respecting the lostpassword_url filter.

Open WordPress Playground Preview

The login notice and the user email shown after a compromised-password
reset built their link from wp_login_url(), which skips the
lostpassword_url filter. Sites that move their lost-password flow
(WooCommerce My Account, membership sites) sent these users to the
stock wp-login.php form.
@github-actions

Copy link
Copy Markdown

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

Unlinked Accounts

The following contributors have not linked their GitHub and WordPress.org accounts: @chubes4.

Contributors, please read how to link your accounts to ensure your work is properly credited in WordPress releases.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Unlinked contributors: chubes4.


To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant