Merge "EditPage: Remove unused $is*Subpage variables, deprecated in 1.30"

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 131a3b9..ed1c4df 100644 (file)
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -244,6 +244,11 @@ changes to languages because of Phabricator reports.
   * Title::isCssJsSubpage – use ::isUserConfigPage
   * Title::isCssSubpage – use ::isUserCssConfigPage
   * Title::isJsSubpage – use ::isUserJsConfigPage
+* The following variables and method in EditPage, deprecated in MediaWiki 1.30, were removed:
+  * $isCssJsSubpage — use ::isUserConfigPage()
+  * $isCssSubpage — use ::isUserCssConfigPage()
+  * $isJsSubpage — use ::isUserJsConfigPage()
+  * $isWrongCaseCssJsPage – use ::isWrongCaseUserConfigPage()
 * 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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index e00e930..652b355 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -238,30 +238,6 @@ class EditPage {
        /** @var bool */
        public $isConflict = false;
 
-       /**
-        * @deprecated since 1.30 use Title::isUserConfigPage()
-        * @var bool
-        */
-       public $isCssJsSubpage = false;
-
-       /**
-        * @deprecated since 1.30 use Title::isUserCssConfigPage()
-        * @var bool
-        */
-       public $isCssSubpage = false;
-
-       /**
-        * @deprecated since 1.30 use Title::isUserJsConfigPage()
-        * @var bool
-        */
-       public $isJsSubpage = false;
-
-       /**
-        * @deprecated since 1.30
-        * @var bool
-        */
-       public $isWrongCaseCssJsPage = false;
-
        /** @var bool New page or new section */
        public $isNew = false;
 
@@ -660,13 +636,6 @@ class EditPage {
                }
 
                $this->isConflict = false;
-               // css / js subpages of user pages get a special treatment
-               // The following member variables are deprecated since 1.30,
-               // the functions should be used instead.
-               $this->isCssJsSubpage = $this->mTitle->isUserConfigPage();
-               $this->isCssSubpage = $this->mTitle->isUserCssConfigPage();
-               $this->isJsSubpage = $this->mTitle->isUserJsConfigPage();
-               $this->isWrongCaseCssJsPage = $this->isWrongCaseUserConfigPage();
 
                # Show applicable editing introductions
                if ( $this->formtype == 'initial' || $this->firsttime ) {