From: withoutaname <drevitchi@gmail.com>
Date: Wed, 16 Jul 2014 22:17:47 +0000 (-0700)
Subject: Fix incorrect function call scope in Title.php
X-Git-Tag: 1.31.0-rc.0~14918
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=c62d2aa55542864f2b70063230af11126bdacf3a;p=lhc%2Fweb%2Fwiklou.git

Fix incorrect function call scope in Title.php

Calls to getTitleParser() and getTitleFormatter() were using $this->
but the functions were declared static.

Change-Id: If21be84c68725b2afe181229cb697b948d26d6c6
---

diff --git a/includes/Title.php b/includes/Title.php
index 477373a4f6..746ffabad6 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -977,7 +977,7 @@ class Title {
 		}
 
 		try {
-			$formatter = $this->getTitleFormatter();
+			$formatter = self::getTitleFormatter();
 			return $formatter->getNamespaceName( $this->mNamespace, $this->mDbkeyform );
 		} catch ( InvalidArgumentException $ex )  {
 			wfDebug( __METHOD__ . ': ' . $ex->getMessage() . "\n" );
@@ -3291,7 +3291,7 @@ class Title {
 			// @note: splitTitleString() is a temporary hack to allow MediaWikiTitleCodec to share
 			//        the parsing code with Title, while avoiding massive refactoring.
 			// @todo: get rid of secureAndSplit, refactor parsing code.
-			$parser = $this->getTitleParser();
+			$parser = self::getTitleParser();
 			$parts = $parser->splitTitleString( $dbkey, $this->getDefaultNamespace() );
 		} catch ( MalformedTitleException $ex ) {
 			return false;