Merge "Add 2 FIXMEs about confusingly named functions"

diff --combined includes/Title.php
index 50721af,da0efee..e3ceaee
--- 1/includes/Title.php
--- 2/includes/Title.php
+++ b/includes/Title.php
@@@ -161,9 -161,9 +161,9 @@@ class Title implements LinkTarget 
         * Avoid usage of this singleton by using TitleValue
         * and the associated services when possible.
         *
 -       * @return TitleParser
 +       * @return MediaWikiTitleCodec
         */
 -      private static function getTitleParser() {
 +      private static function getMediaWikiTitleCodec() {
                global $wgContLang, $wgLocalInterwikis;
  
                static $titleCodec = null;
@@@ -200,9 -200,9 +200,9 @@@
         * @return TitleFormatter
         */
        private static function getTitleFormatter() {
 -              // NOTE: we know that getTitleParser() returns a MediaWikiTitleCodec,
 +              // NOTE: we know that getMediaWikiTitleCodec() returns a MediaWikiTitleCodec,
                //      which implements TitleFormatter.
 -              return self::getTitleParser();
 +              return self::getMediaWikiTitleCodec();
        }
  
        function __construct() {
@@@ -1261,6 -1261,7 +1261,7 @@@
         * show "inactive" CSS or JS.
         *
         * @return bool
+        * @todo FIXME: Rename to isSiteConfigPage() and remove deprecated hook
         */
        public function isCssOrJsPage() {
                $isCssOrJsPage = NS_MEDIAWIKI == $this->mNamespace
@@@ -1279,6 -1280,7 +1280,7 @@@
        /**
         * Is this a .css or .js subpage of a user page?
         * @return bool
+        * @todo FIXME: Rename to isUserConfigPage()
         */
        public function isCssJsSubpage() {
                return ( NS_USER == $this->mNamespace && $this->isSubpage()
@@@ -3353,7 -3355,7 +3355,7 @@@
                // @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.
 -              $titleParser = self::getTitleParser();
 +              $titleParser = self::getMediaWikiTitleCodec();
                // MalformedTitleException can be thrown here
                $parts = $titleParser->splitTitleString( $dbkey, $this->getDefaultNamespace() );