From: Kunal Mehta <legoktm@gmail.com>
Date: Fri, 12 Dec 2014 19:17:55 +0000 (-0800)
Subject: Check hasTitle() in RequestContext::setWikiPage()
X-Git-Tag: 1.31.0-rc.0~12985^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=0a7815967bcb8c6c7d644515e19f19cf32fd207e;p=lhc%2Fweb%2Fwiklou.git

Check hasTitle() in RequestContext::setWikiPage()

Calling getTitle() right away can lead to reading from
$wgTitle, so check with hasTitle() first.

This avoids a globaltitlefail in ApiEditPage.

Change-Id: I749cc33dd4f1fd6bc7598be34f37e591d822c3f2
---

diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php
index fe17fdef95..c76e3a98d6 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -182,9 +182,8 @@ class RequestContext implements IContextSource {
 	 * @param WikiPage $p
 	 */
 	public function setWikiPage( WikiPage $p ) {
-		$contextTitle = $this->getTitle();
 		$pageTitle = $p->getTitle();
-		if ( !$contextTitle || !$pageTitle->equals( $contextTitle ) ) {
+		if ( !$this->hasTitle() || !$pageTitle->equals( $this->getTitle() ) ) {
 			$this->setTitle( $pageTitle );
 		}
 		// Defer this to the end since setTitle sets it to null.