Merge "Re add @access protected on Title::__construct"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 12 May 2016 19:10:31 +0000 (19:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 12 May 2016 19:10:31 +0000 (19:10 +0000)
1  2 
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() {
        }