Merge "EditPage: Remove unused deprecated method ::submit()"

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 5ee2f67..7364d9a 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -189,6 +189,8 @@ because of Phabricator reports.
   Use the mediawiki.String module instead.
 * mw.language.specialCharacters, deprecated in 1.33, has been removed.
   Use require( 'mediawiki.language.specialCharacters' ) instead.
+* EditPage::submit(), deprecated in 1.29, has been removed. Used $this->edit()
+  directly.
 * …
 
 === Deprecations in 1.34 ===

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 47a8b5b..ab7d6bb 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -565,14 +565,6 @@ class EditPage {
                $this->enableApiEditOverride = $enableOverride;
        }
 
-       /**
-        * @deprecated since 1.29, call edit directly
-        */
-       public function submit() {
-               wfDeprecated( __METHOD__, '1.29' );
-               $this->edit();
-       }
-
        /**
         * This is the function that gets called for "action=edit". It
         * sets up various member variables, then passes execution to