From 0a7815967bcb8c6c7d644515e19f19cf32fd207e Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Fri, 12 Dec 2014 11:17:55 -0800 Subject: [PATCH] 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 --- includes/context/RequestContext.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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. -- 2.20.1