Add required attribute to captcha answers per

http://www.mediawiki.org/wiki/Extension_talk:ConfirmEdit#HTML5_required_input_8261
This won't have any real-world effect until r67283
HTML5 form validation is enabled again.

diff --git a/FancyCaptcha.class.php b/FancyCaptcha.class.php
index b2f5c10edd8cfda18104f0534226c772b8c33f50..26227aa30bc11fd0014bc8917e547d664d2baaa2 100644 (file)
--- a/FancyCaptcha.class.php
+++ b/FancyCaptcha.class.php
@@ -69,9 +69,10 @@ class FancyCaptcha extends SimpleCaptcha {
                                'id'    => 'wpCaptchaId',
                                'value' => $index ) ) .
                        "<p>" .
-                       Xml::element( 'input', array(
+                       Html::element( 'input', array(
                                'name' => 'wpCaptchaWord',
                                'id'   => 'wpCaptchaWord',
+                               'required',
                                'tabindex' => 1 ) ) . // tab in before the edit textarea
                        "</p>\n";
        }

diff --git a/MathCaptcha.class.php b/MathCaptcha.class.php
index 5dbbeeb99bc9a66a71c63d9e8571f6853d5a4ced..650c37d6335c1e177c543e05eeb37d5d9310f9dd 100644 (file)
--- a/MathCaptcha.class.php
+++ b/MathCaptcha.class.php
@@ -22,7 +22,7 @@ class MathCaptcha extends SimpleCaptcha {
                $index = $this->storeCaptcha( array( 'answer' => $answer ) );
 
                $form = '<table><tr><td>' . $this->fetchMath( $sum ) . '</td>';
-               $form .= '<td>' . Xml::input( 'wpCaptchaWord', false, false, array( 'tabindex' => '1' ) ) . '</td></tr></table>';
+               $form .= '<td>' . Html::input( 'wpCaptchaWord', false, false, array( 'tabindex' => '1', 'required' ) ) . '</td></tr></table>';
                $form .= Html::hidden( 'wpCaptchaId', $index );
                return $form;
        }

diff --git a/QuestyCaptcha.class.php b/QuestyCaptcha.class.php
index 478fcf3480729b628c8350f4bffbb7f096d3590f..635277af513c15a85416849fa7286218c1cbf6bd 100644 (file)
--- a/QuestyCaptcha.class.php
+++ b/QuestyCaptcha.class.php
@@ -40,9 +40,10 @@ class QuestyCaptcha extends SimpleCaptcha {
                }
                $index = $this->storeCaptcha( $captcha );
                return "<p><label for=\"wpCaptchaWord\">{$captcha['question']}</label> " .
-                       Xml::element( 'input', array(
+                       Html::element( 'input', array(
                                'name' => 'wpCaptchaWord',
                                'id'   => 'wpCaptchaWord',
+                               'required',
                                'tabindex' => 1 ) ) . // tab in before the edit textarea
                        "</p>\n" .
                        Xml::element( 'input', array(