Merge "Title: Refactor JS/CSS page handling to be more sane"

diff --cc RELEASE-NOTES-1.31
index f49a582,c1bc8f7..131a3b9
--- 1/RELEASE-NOTES-1.31
--- 2/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@@ -238,10 -233,13 +238,16 @@@ changes to languages because of Phabric
    * CommentStore::getCommentLegacy
    * CommentStore::insert
    * CommentStore::insertWithTemplate
+ * The following methods in Title have been renamed, and the old ones are deprecated:
+   * Title::getSkinFromCssJsSubpage – use ::getSkinFromConfigSubpage
+   * Title::isCssOrJsPage – use ::isSiteConfigPage
+   * Title::isCssJsSubpage – use ::isUserConfigPage
+   * Title::isCssSubpage – use ::isUserCssConfigPage
+   * Title::isJsSubpage – use ::isUserJsConfigPage
  * The method ResourceLoaderModule::getPosition(), deprecated in 1.29, has been removed.
 +* The DeferredStringifier class is deprecated, use Message::listParam() instead.
 +* The type string for the parameter $lang of DateFormatter::getInstance is
 +  deprecated.
  
  == Compatibility ==
  MediaWiki 1.31 requires PHP 5.5.9 or later. Although HHVM 3.18.5 or later is supported,

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc languages/i18n/en.json
Simple merge

diff --cc languages/i18n/qqq.json
Simple merge