Merge "EditPage: Remove unused variable in getCheckboxesOOUI()"

diff --combined includes/EditPage.php
index 6ea293c,664e9b8..9d2d402
--- 1/includes/EditPage.php
--- 2/includes/EditPage.php
+++ b/includes/EditPage.php
@@@ -3064,51 -3064,9 +3064,51 @@@ class EditPage 
                ];
        }
  
 +      /**
 +       * Standard summary input and label (wgSummary), abstracted so EditPage
 +       * subclasses may reorganize the form.
 +       * Note that you do not need to worry about the label's for=, it will be
 +       * inferred by the id given to the input. You can remove them both by
 +       * passing [ 'id' => false ] to $userInputAttrs.
 +       *
 +       * @deprecated since 1.30 Use getSummaryInputWidget() instead
 +       * @param string $summary The value of the summary input
 +       * @param string $labelText The html to place inside the label
 +       * @param array $inputAttrs Array of attrs to use on the input
 +       * @param array $spanLabelAttrs Array of attrs to use on the span inside the label
 +       * @return array An array in the format [ $label, $input ]
 +       */
 +      public function getSummaryInput( $summary = "", $labelText = null,
 +              $inputAttrs = null, $spanLabelAttrs = null
 +      ) {
 +              wfDeprecated( __METHOD__, '1.30' );
 +              $inputAttrs = $this->getSummaryInputAttributes( $inputAttrs );
 +              $inputAttrs += Linker::tooltipAndAccesskeyAttribs( 'summary' );
 +
 +              $spanLabelAttrs = ( is_array( $spanLabelAttrs ) ? $spanLabelAttrs : [] ) + [
 +                      'class' => $this->missingSummary ? 'mw-summarymissed' : 'mw-summary',
 +                      'id' => "wpSummaryLabel"
 +              ];
 +
 +              $label = null;
 +              if ( $labelText ) {
 +                      $label = Xml::tags(
 +                              'label',
 +                              $inputAttrs['id'] ? [ 'for' => $inputAttrs['id'] ] : null,
 +                              $labelText
 +                      );
 +                      $label = Xml::tags( 'span', $spanLabelAttrs, $label );
 +              }
 +
 +              $input = Html::input( 'wpSummary', $summary, 'text', $inputAttrs );
 +
 +              return [ $label, $input ];
 +      }
 +
        /**
         * Builds a standard summary input with a label.
         *
 +       * @deprecated since 1.30 Use getSummaryInputWidget() instead
         * @param string $summary The value of the summary input
         * @param string $labelText The html to place inside the label
         * @param array $inputAttrs Array of attrs to use on the input
@@@ -3116,20 -3074,6 +3116,20 @@@
         * @return OOUI\FieldLayout OOUI FieldLayout with Label and Input
         */
        function getSummaryInputOOUI( $summary = "", $labelText = null, $inputAttrs = null ) {
 +              wfDeprecated( __METHOD__, '1.30' );
 +              $this->getSummaryInputWidget( $summary, $labelText, $inputAttrs );
 +      }
 +
 +      /**
 +       * Builds a standard summary input with a label.
 +       *
 +       * @param string $summary The value of the summary input
 +       * @param string $labelText The html to place inside the label
 +       * @param array $inputAttrs Array of attrs to use on the input
 +       *
 +       * @return OOUI\FieldLayout OOUI FieldLayout with Label and Input
 +       */
 +      function getSummaryInputWidget( $summary = "", $labelText = null, $inputAttrs = null ) {
                $inputAttrs = OOUI\Element::configFromHtmlAttributes(
                        $this->getSummaryInputAttributes( $inputAttrs )
                );
@@@ -3178,7 -3122,7 +3178,7 @@@
                }
  
                $labelText = $this->context->msg( $isSubjectPreview ? 'subject' : 'summary' )->parse();
 -              $wgOut->addHTML( $this->getSummaryInputOOUI(
 +              $wgOut->addHTML( $this->getSummaryInputWidget(
                                $summary,
                                $labelText,
                                [ 'class' => $summaryClass ]
@@@ -3221,7 -3165,7 +3221,7 @@@
                $wgOut->addHTML( Html::hidden( 'wpStarttime', $this->starttime ) );
                $wgOut->addHTML( Html::hidden( 'wpEdittime', $this->edittime ) );
                $wgOut->addHTML( Html::hidden( 'editRevId', $this->editRevId ) );
 -              $wgOut->addHTML( Html::hidden( 'wpScrolltop', $this->scrolltop ) );
 +              $wgOut->addHTML( Html::hidden( 'wpScrolltop', $this->scrolltop, [ 'id' => 'wpScrolltop' ] ) );
  
                if ( !$this->checkUnicodeCompliantBrowser() ) {
                        $wgOut->addHTML( Html::hidden( 'safemode', '1' ) );
@@@ -4142,7 -4086,7 +4142,7 @@@
         *   where bool indicates the checked status of the checkbox
         * @return array
         */
 -      protected function getCheckboxesDefinition( $checked ) {
 +      public function getCheckboxesDefinition( $checked ) {
                global $wgUser;
                $checkboxes = [];
  
@@@ -4263,9 -4207,6 +4263,6 @@@
                        if ( isset( $options['title-message'] ) ) {
                                $title = $this->context->msg( $options['title-message'] )->text();
                        }
-                       if ( isset( $options['label-id'] ) ) {
-                               $labelAttribs['id'] = $options['label-id'];
-                       }
  
                        $checkboxes[ $legacyName ] = new OOUI\FieldLayout(
                                new OOUI\CheckboxInputWidget( [