SLOP-377: replace removed WatchAction::getWatchToken() with getEditToken( 'watch' ) - #12
Open
tosfos wants to merge 1 commit into
Open
SLOP-377: replace removed WatchAction::getWatchToken() with getEditToken( 'watch' )#12tosfos wants to merge 1 commit into
tosfos wants to merge 1 commit into
Conversation
…ken(watch) WatchAction::getWatchToken() was removed in MW 1.38; it was a thin wrapper around $user->getEditToken( \x27watch\x27 ), which core still validates when processing action=watch. Port both call sites.
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars. ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
WatchAction::getWatchToken()was removed in MediaWiki 1.38. Both call sites fatal on MW 1.38+:includes/WatchAnalyticsParserFunctions.php:231({{#watchers_needed:}}watch links)includes/WatchSuggest.php:353(watch-suggestion links)The removed method was a thin wrapper:
return $user->getEditToken( 'watch' );— and the salted'watch'token is exactly what core's watch form still validates (HTMLForm::$mTokenSalt,matchEditToken( $token, 'watch' )). Both sites now call$user->getEditToken( 'watch' )directly, producing identical URLs.Verification
php -lclean on php:7.4-cli and php:8.2-cli for both files.+\suffix and round-trips throughmatchEditToken( ..., 'watch' ); salt mismatch rejected, proving the salt is actually applied.getWatchTokenreferences.Closes SLOP-377.