Skip to content

SLOP-397: port dead PageContentSaveComplete/TitleMoveComplete hooks to PageSaveComplete/PageMoveComplete #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tosfos wants to merge 1 commit into
base: master
Choose a base branch
from
+37 −22
Open

SLOP-397: port dead PageContentSaveComplete/TitleMoveComplete hooks to PageSaveComplete/PageMoveComplete #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 33 additions & 18 deletions Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ public static function onBeforePageDisplay( $out /*, $skin*/ ) {
}

/**
* Handler for TitleMoveComplete hook. This function makes it so page-moves
* Handler for PageMoveComplete hook (the replacement for the removed
* TitleMoveComplete hook). This function makes it so page-moves
* are handled correctly in the `watchlist` table. Prior to a MW 1.25 alpha
* release when a page is moved, the new entries into the `watchlist` table
* are given an notification timestamp of NULL; they should be identical to
Expand All @@ -148,27 +149,41 @@ public static function onBeforePageDisplay( $out /*, $skin*/ ) {
* @todo FIXME: make this work for <1.25 and 1.25+
* @todo document which commit fixes this issue specifically.
*
* @see http://www.mediawiki.org/wiki/Manual:Hooks/TitleMoveComplete
* @see https://www.mediawiki.org/wiki/Manual:Hooks/PageMoveComplete
*
* @param Title &$originalTitle
* @param Title &$newTitle
* @param User &$user
* @param int $oldid
* @param int $newid
* @param FIXME string|null $reason
* @param LinkTarget $old
* @param LinkTarget $new
* @param UserIdentity $user
* @param int $pageid
* @param int $redirid
* @param string $reason
*
* @return bool true in all cases
*/
public static function onTitleMoveComplete( Title &$originalTitle, Title &$newTitle,
User &$user, $oldid, $newid, $reason = null ) {
public static function onPageMoveComplete( $old, $new, $user, $pageid,
$redirid, $reason = null ) {
$originalTitle = Title::newFromLinkTarget( $old );
$newTitle = Title::newFromLinkTarget( $new );

#
# Record move in watch stats
#
WatchStateRecorder::recordPageChange( Article::newFromID( $oldid ) );

// Article::newFromID() was removed from core; record against a
// WikiPage built directly from the moved page's ID instead.
if ( $pageid > 0 ) {
$oldPage = WikiPage::newFromID( $pageid, WikiPage::READ_LATEST );
if ( $oldPage ) {
WatchStateRecorder::recordPageChange( $oldPage );
}
}

// if a redirect was created, record data for the "new" page (the redirect)
if ( $newid > 0 ) {
WatchStateRecorder::recordPageChange( Article::newFromID( $newid ) );
if ( $redirid > 0 ) {
$newPage = WikiPage::newFromID( $redirid, WikiPage::READ_LATEST );
if ( $newPage ) {
WatchStateRecorder::recordPageChange( $newPage );
}
}

#
Expand Down Expand Up @@ -295,17 +310,17 @@ public static function onPageViewUpdates( WikiPage $wikiPage, User $user ) {
* new state of "watches" and "reviews" to be recorded for the page and all
* of its watchers.
*
* Additional parameters available include: User $user, Content $content,
* string $summary, boolean $isMinor, boolean $isWatch, $section Deprecated,
* integer $flags, {Revision|null} $revision, Status $status, integer $baseRevId
* Handler for PageSaveComplete, the replacement (MW 1.35+) for the removed
* PageContentSaveComplete hook. The WikiPage parameter is unchanged, so
* the original handler body carries over directly.
*
* @see https://www.mediawiki.org/wiki/Manual:Hooks/PageContentSaveComplete
* @see https://www.mediawiki.org/wiki/Manual:Hooks/PageSaveComplete
*
* @param WikiPage $wikipage
*
* @return bool
*/
public static function onPageContentSaveComplete( WikiPage $wikipage ) {
public static function onPageSaveComplete( WikiPage $wikipage ) {
WatchStateRecorder::recordPageChange( $wikipage );
return true;
}
Expand Down
8 changes: 4 additions & 4 deletions extension.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,14 @@
"ParserFirstCallInit": [
"WatchAnalyticsParserFunctions::setup"
],
"TitleMoveComplete": [
"WatchAnalyticsHooks::onTitleMoveComplete"
"PageMoveComplete": [
"WatchAnalyticsHooks::onPageMoveComplete"
],
"PageViewUpdates": [
"WatchAnalyticsHooks::onPageViewUpdates"
],
"PageContentSaveComplete": [
"WatchAnalyticsHooks::onPageContentSaveComplete"
"PageSaveComplete": [
"WatchAnalyticsHooks::onPageSaveComplete"
],
"MagicWordwgVariableIDs": [
"WatchAnalyticsHooks::addMagicWordVariableIDs"
Expand Down