Merge "Fix type to callable on FileRepo::getErrorCleanupFunction"

[lhc/web/wiklou.git] / includes / htmlform / HTMLForm.php

diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index f5be83f..acf64db 100644 (file)
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -1062,10 +1062,10 @@ class HTMLForm extends ContextSource {
        }
 
        /**
-        * Set whether the HTML form can be collapsed.
+        * Enable collapsible mode, and set whether the form is collapsed by default.
         *
         * @since 1.34
-        * @param bool $collapsedByDefault (optional) whether the form is collapsed by default
+        * @param bool $collapsedByDefault Whether the form is collapsed by default (optional).
         * @return HTMLForm $this for chaining calls
         */
        public function setCollapsibleOptions( $collapsedByDefault = false ) {
@@ -1277,20 +1277,6 @@ class HTMLForm extends ContextSource {
                return $this->displaySection( $this->mFieldTree, $this->mTableId );
        }
 
-       /**
-        * Format and display an error message stack.
-        *
-        * @param string|array|Status $errors
-        *
-        * @deprecated since 1.28, use getErrorsOrWarnings() instead
-        *
-        * @return string
-        */
-       public function getErrors( $errors ) {
-               wfDeprecated( __METHOD__, '1.28' );
-               return $this->getErrorsOrWarnings( $errors, 'error' );
-       }
-
        /**
         * Returns a formatted list of errors or warnings from the given elements.
         *