Merge "EditPage: Remove isOouiEnabled(), deprecated since MW 1.30"

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index a1edddb..801332c 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -58,6 +58,7 @@ changes to languages because of Phabricator reports.
   removed (deprecated in 1.31).
 * The EDIT_TOKEN_SUFFIX constant was removed (deprecated in 1.27).
   Use MediaWiki\Session\Token::SUFFIX instead.
+* EditPage::isOouiEnabled(), deprecated in 1.30, was removed.
 
 === Deprecations in 1.32 ===
 * Use of a StartProfiler.php file is deprecated in favour of placing

diff --git a/includes/EditPage.php b/includes/EditPage.php
index fcf3d49..4f6b7b4 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -504,16 +504,6 @@ class EditPage {
                }
        }
 
-       /**
-        * Check if the edit page is using OOUI controls
-        * @return bool Always true
-        * @deprecated since 1.30
-        */
-       public function isOouiEnabled() {
-               wfDeprecated( __METHOD__, '1.30' );
-               return true;
-       }
-
        /**
         * Returns if the given content model is editable.
         *