Merge "Revert "wikibits: Remove redundant stubs for document.write""

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

diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 9b58f92..ff6cfff 100644 (file)
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -159,6 +159,7 @@ class HTMLForm extends ContextSource {
                'date' => HTMLDateTimeField::class,
                'time' => HTMLDateTimeField::class,
                'datetime' => HTMLDateTimeField::class,
+               'expiry' => HTMLExpiryField::class,
                // HTMLTextField will output the correct type="" attribute automagically.
                // There are about four zillion other HTML5 input types, like range, but
                // we don't use those at the moment, so no point in adding all of them.
@@ -430,17 +431,6 @@ class HTMLForm extends ContextSource {
                return $this->displayFormat;
        }
 
-       /**
-        * Test if displayFormat is 'vform'
-        * @since 1.22
-        * @deprecated since 1.25
-        * @return bool
-        */
-       public function isVForm() {
-               wfDeprecated( __METHOD__, '1.25' );
-               return false;
-       }
-
        /**
         * Get the HTMLFormField subclass for this descriptor.
         *
@@ -1347,10 +1337,13 @@ class HTMLForm extends ContextSource {
        /**
         * Identify that the submit button in the form has a progressive action
         * @since 1.25
+        * @deprecated since 1.32, No need to call. Submit button already
+        * has a progressive action form.
         *
         * @return HTMLForm $this for chaining calls (since 1.28)
         */
        public function setSubmitProgressive() {
+               wfDeprecated( __METHOD__, '1.32' );
                $this->mSubmitFlags = [ 'progressive', 'primary' ];
 
                return $this;