Restore #mw-history-search id on history action fieldset

Change-Id: I3551667b1f64a3cd9227b07df2a215ccb701ea5d

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index 7ff6f7d..06e214f 100644 (file)
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -270,6 +270,7 @@ class HistoryAction extends FormlessAction {
                        ->setAction( wfScript() )
                        ->setId( 'mw-history-searchform' )
                        ->setSubmitText( $this->msg( 'historyaction-submit' )->text() )
                        ->setAction( wfScript() )
                        ->setId( 'mw-history-searchform' )
                        ->setSubmitText( $this->msg( 'historyaction-submit' )->text() )

+                       ->setWrapperAttributes( [ 'id' => 'mw-history-search' ] )

                        ->setWrapperLegend( $this->msg( 'history-fieldset-title' )->text() );
                $htmlForm->loadData();
 
                        ->setWrapperLegend( $this->msg( 'history-fieldset-title' )->text() );
                $htmlForm->loadData();
 

diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index ee0da7b..3c9b23c 100644 (file)
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -233,6 +233,7 @@ class HTMLForm extends ContextSource {
        protected $mButtons = [];
 
        protected $mWrapperLegend = false;
        protected $mButtons = [];
 
        protected $mWrapperLegend = false;

+       protected $mWrapperAttributes = [];

 
        /**
         * Salt for the edit token.
 
        /**
         * Salt for the edit token.


@@ -1089,7 +1090,7 @@ class HTMLForm extends ContextSource {
                # Include a <fieldset> wrapper for style, if requested.
                if ( $this->mWrapperLegend !== false ) {
                        $legend = is_string( $this->mWrapperLegend ) ? $this->mWrapperLegend : false;
                # Include a <fieldset> wrapper for style, if requested.
                if ( $this->mWrapperLegend !== false ) {
                        $legend = is_string( $this->mWrapperLegend ) ? $this->mWrapperLegend : false;

-                       $html = Xml::fieldset( $legend, $html );
+                       $html = Xml::fieldset( $legend, $html, $this->mWrapperAttributes );

                }
 
                return Html::rawElement(
                }
 
                return Html::rawElement(


@@ -1534,6 +1535,19 @@ class HTMLForm extends ContextSource {
                return $this;
        }
 
                return $this;
        }
 

+       /**
+        * For internal use only. Use is discouraged, and should only be used where
+        * support for gadgets/user scripts is warranted.
+        * @param array $attributes
+        * @internal
+        * @return HTMLForm $this for chaining calls
+        */
+       public function setWrapperAttributes( $attributes ) {
+               $this->mWrapperAttributes = $attributes;
+
+               return $this;
+       }
+

        /**
         * Prompt the whole form to be wrapped in a "<fieldset>", with
         * this message as its "<legend>" element.
        /**
         * Prompt the whole form to be wrapped in a "<fieldset>", with
         * this message as its "<legend>" element.

diff --git a/includes/htmlform/OOUIHTMLForm.php b/includes/htmlform/OOUIHTMLForm.php
index e7e3ff6..738db09 100644 (file)
--- a/includes/htmlform/OOUIHTMLForm.php
+++ b/includes/htmlform/OOUIHTMLForm.php
@@ -284,7 +284,7 @@ class OOUIHTMLForm extends HTMLForm {
                                                'content' => new OOUI\HtmlSnippet( $html )
                                        ] ),
                                ],
                                                'content' => new OOUI\HtmlSnippet( $html )
                                        ] ),
                                ],

-                       ] );
+                       ] + OOUI\Element::configFromHtmlAttributes( $this->mWrapperAttributes ) );

                } else {
                        $content = new OOUI\HtmlSnippet( $html );
                }
                } else {
                        $content = new OOUI\HtmlSnippet( $html );
                }