From 75e03c7860f54734eb7164b84cfa59d6cb9ab07e Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Mon, 23 Jul 2018 08:44:02 -0400 Subject: [PATCH] PageArchive: Pass correct overrides to newRevisionFromArchiveRow() Revision::newFromArchiveRow took 'page' as an override for ar_page_id, while RevisionStore::newRevisionFromArchiveRow() needs 'page_id'. Thanks to sanity checks elsewhere in RevisionStore, this mistaken override causes an exception to be thrown rather than undeleted revisions potentially pointing to the wrong page. Bug: T200072 Change-Id: I9d7543866c674f4d8aea9ec00fcc15cbf616ca66 --- includes/page/PageArchive.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/page/PageArchive.php b/includes/page/PageArchive.php index aa34dd24c2..dfc7c02f05 100644 --- a/includes/page/PageArchive.php +++ b/includes/page/PageArchive.php @@ -767,7 +767,7 @@ class PageArchive { 0, $this->title, [ - 'page' => $pageId, + 'page_id' => $pageId, 'deleted' => $unsuppress ? 0 : $row->ar_deleted ] ); -- 2.20.1