From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 12 May 2016 19:10:31 +0000 (+0000)
Subject: Merge "Re add @access protected on Title::__construct"
X-Git-Tag: 1.31.0-rc.0~7005
X-Git-Url: http://git.cyclocoop.org/%27http:/code.google.com/p/ie7-js/00?a=commitdiff_plain;h=6fcabeeb0b400b0d2987b6c934e6c1b591e7b486;p=lhc%2Fweb%2Fwiklou.git

Merge "Re add @access protected on Title::__construct"
---

6fcabeeb0b400b0d2987b6c934e6c1b591e7b486
diff --cc includes/Title.php
index d070609aa3,54ce384b1b..876afe620c
--- a/includes/Title.php
+++ b/includes/Title.php
@@@ -167,9 -204,14 +167,12 @@@ class Title implements LinkTarget 
  	 * @return TitleFormatter
  	 */
  	private static function getTitleFormatter() {
 -		// NOTE: we know that getMediaWikiTitleCodec() returns a MediaWikiTitleCodec,
 -		//      which implements TitleFormatter.
 -		return self::getMediaWikiTitleCodec();
 +		return MediaWikiServices::getInstance()->getTitleFormatter();
  	}
  
+ 	/**
+ 	 * @access protected
+ 	 */
  	function __construct() {
  	}