From b2da5cf4e4e03c3791db21eecc0af6ef10e5be8b Mon Sep 17 00:00:00 2001
From: "This, that and the other" <at.light@live.com.au>
Date: Wed, 13 Jan 2016 00:30:33 +1100
Subject: [PATCH] Update the WikiPage object with the new ID when undeleting

Issue introduced by 0aa6486cbff1e0de05a91cb88158588595f4a872.

Change-Id: I2c4fde5e66f280a6bc2de1b13453f1c40385a20d
---
 includes/page/WikiPage.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index e3e6e15d41..7bd87f7aa3 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1172,11 +1172,11 @@ class WikiPage implements Page, IDBAccessObject {
 	 * @return bool|int The newly created page_id key; false if the title already existed
 	 */
 	public function insertOn( $dbw, $pageId = null ) {
-		$pageId = $pageId ?: $dbw->nextSequenceValue( 'page_page_id_seq' );
+		$pageIdForInsert = $pageId ?: $dbw->nextSequenceValue( 'page_page_id_seq' );
 		$dbw->insert(
 			'page',
 			array(
-				'page_id'           => $pageId,
+				'page_id'           => $pageIdForInsert,
 				'page_namespace'    => $this->mTitle->getNamespace(),
 				'page_title'        => $this->mTitle->getDBkey(),
 				'page_restrictions' => '',
@@ -1192,7 +1192,7 @@ class WikiPage implements Page, IDBAccessObject {
 		);
 
 		if ( $dbw->affectedRows() > 0 ) {
-			$newid = $dbw->insertId();
+			$newid = $pageId ?: $dbw->insertId();
 			$this->mId = $newid;
 			$this->mTitle->resetArticleID( $newid );
 
-- 
2.20.1