From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Mon, 23 Jul 2018 12:44:02 +0000 (-0400)
Subject: PageArchive: Pass correct overrides to newRevisionFromArchiveRow()
X-Git-Tag: 1.34.0-rc.0~4672^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=75e03c7860f54734eb7164b84cfa59d6cb9ab07e;p=lhc%2Fweb%2Fwiklou.git

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
---

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
 					]
 				);