Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MovePage: Handle target page deletion failure gracefully.

Browse source 
Throwing exception is not appropriate here and will prevent proper usage
of ArticleDeleteHook, which is ostensibly meant to allow extensions to
cleanly abort the deletion if they need to.

When the target page deletion fails, instead of blowing everything up
with exception, just cancel the open atomic section and return the
user-friendly deletion error back to the user.

Bug: T265779
Change-Id: I66b4458a103f1274715e22a784344c55a62a59ac
This commit is contained in:
Ammar Abdulhamid 2020-10-17 06:53:10 +01:00 committed by Ammarpad
parent a724989714
commit db20453b0a
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
includes/MovePage.php
View file

@ -570,10 +570,18 @@ class MovePage {
$pageid = $this->oldTitle->getArticleID( Title::READ_LATEST );
$protected = $this->oldTitle->isProtected();
// Do the actual move; if this fails, it will throw an MWException(!)
$nullRevision = $this->moveToInternal( $user, $this->newTitle, $reason, $createRedirect,
// Attempt the actual move
$moveAttemptResult = $this->moveToInternal( $user, $this->newTitle, $reason, $createRedirect,
$changeTags );
if ( $moveAttemptResult instanceof Status ) {
// T265779: Attempt to delete target page failed
$dbw->cancelAtomic( __METHOD__ );
return $moveAttemptResult;
} else {
$nullRevision = $moveAttemptResult;
}
// Refresh the sortkey for this row. Be careful to avoid resetting
// cl_timestamp, which may disturb time-based lists on some sites.
// @todo This block should be killed, it's duplicating code
@ -796,8 +804,7 @@ class MovePage {
* @param bool $createRedirect Whether to leave a redirect at the old title. Does not check
* if the user has the suppressredirect right
* @param string[] $changeTags Change tags to apply to the entry in the move log
* @return RevisionRecord the revision created by the move
* @throws MWException
* @return RevisionRecord|Status The revision created by the move or Status object on failure
*/
private function moveToInternal( User $user, &$nt, $reason = '', $createRedirect = true,
array $changeTags = []
@ -829,8 +836,7 @@ class MovePage {
);
if ( !$status->isGood() ) {
throw new MWException( 'Failed to delete page-move revision: '
. $status->getWikiText( false, false, 'en' ) );
return $status;
}
$nt->resetArticleID( false );