From: Kunal Mehta <legoktm@gmail.com>
Date: Sat, 1 Aug 2015 00:00:48 +0000 (-0700)
Subject: Revision::newNullRevision: Make sure the Title is set in the constructor
X-Git-Tag: 1.31.0-rc.0~10558^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/Category:Foo?a=commitdiff_plain;h=e84868d256d50bccd8bf2419b21d8eb9a4c33342;p=lhc%2Fweb%2Fwiklou.git

Revision::newNullRevision: Make sure the Title is set in the constructor

Revision::__construct() calls Revision::getContentModel() to initialize
the 'content_model' field. If a Title object is not set, it will try to
look up the page in the slave database, which might be behind. At that
point it will default to wikitext, which is problematic during imports.

By passing the Title object in the constructor instead of afterwards,
the content model should be intialized properly.

Bug: T91170
Change-Id: I7fea996ea5b723967272af8cb344150aea10bb54
---

diff --git a/includes/Revision.php b/includes/Revision.php
index 71bdf58cea..32ee259f3d 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1641,8 +1641,9 @@ class Revision implements IDBAccessObject {
 				$row['content_format'] = $current->rev_content_format;
 			}
 
+			$row['title'] = Title::makeTitle( $current->page_namespace, $current->page_title );
+
 			$revision = new Revision( $row );
-			$revision->setTitle( Title::makeTitle( $current->page_namespace, $current->page_title ) );
 		} else {
 			$revision = null;
 		}