EditPage: Simplify getEditButtons()

[lhc/web/wiklou.git] / includes / EditPage.php

diff --git a/includes/EditPage.php b/includes/EditPage.php
index a8be3aa..6b02c0f 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -780,7 +780,7 @@ class EditPage {
 
        /**
         * Display a read-only View Source page
-        * @param Content $content content object
+        * @param Content $content
         * @param string $errorMessage additional wikitext error message to display
         */
        protected function displayViewSourcePage( Content $content, $errorMessage = '' ) {
@@ -3604,6 +3604,8 @@ class EditPage {
         * @return string HTML
         */
        public static function getPreviewLimitReport( $output ) {
+               global $wgLang;
+
                if ( !$output || !$output->getLimitReportData() ) {
                        return '';
                }
@@ -3632,7 +3634,9 @@ class EditPage {
                                if ( !$keyMsg->isDisabled() && !$valueMsg->isDisabled() ) {
                                        $limitReport .= Html::openElement( 'tr' ) .
                                                Html::rawElement( 'th', null, $keyMsg->parse() ) .
-                                               Html::rawElement( 'td', null, $valueMsg->params( $value )->parse() ) .
+                                               Html::rawElement( 'td', null,
+                                                       $wgLang->formatNum( $valueMsg->params( $value )->parse() )
+                                               ) .
                                                Html::closeElement( 'tr' );
                                }
                        }
@@ -4390,32 +4394,24 @@ class EditPage {
 
                $buttonLabel = $this->context->msg( $this->getSubmitButtonLabel() )->text();
 
-               $attribs = [
-                       'name' => 'wpSave',
-                       'tabindex' => ++$tabindex,
-               ];
-
-               $saveConfig = OOUI\Element::configFromHtmlAttributes( $attribs );
                $buttons['save'] = new OOUI\ButtonInputWidget( [
+                       'name' => 'wpSave',
+                       'tabIndex' => ++$tabindex,
                        'id' => 'wpSaveWidget',
                        'inputId' => 'wpSave',
                        // Support: IE 6 – Use <input>, otherwise it can't distinguish which button was clicked
                        'useInputTag' => true,
-                       'flags' => [ 'constructive', 'primary' ],
+                       'flags' => [ 'progressive', 'primary' ],
                        'label' => $buttonLabel,
                        'infusable' => true,
                        'type' => 'submit',
                        'title' => Linker::titleAttrib( 'save' ),
                        'accessKey' => Linker::accesskey( 'save' ),
-               ] + $saveConfig );
-
-               $attribs = [
-                       'name' => 'wpPreview',
-                       'tabindex' => ++$tabindex,
-               ];
+               ] );
 
-               $previewConfig = OOUI\Element::configFromHtmlAttributes( $attribs );
                $buttons['preview'] = new OOUI\ButtonInputWidget( [
+                       'name' => 'wpPreview',
+                       'tabIndex' => ++$tabindex,
                        'id' => 'wpPreviewWidget',
                        'inputId' => 'wpPreview',
                        // Support: IE 6 – Use <input>, otherwise it can't distinguish which button was clicked
@@ -4425,15 +4421,11 @@ class EditPage {
                        'type' => 'submit',
                        'title' => Linker::titleAttrib( 'preview' ),
                        'accessKey' => Linker::accesskey( 'preview' ),
-               ] + $previewConfig );
-
-               $attribs = [
-                       'name' => 'wpDiff',
-                       'tabindex' => ++$tabindex,
-               ];
+               ] );
 
-               $diffConfig = OOUI\Element::configFromHtmlAttributes( $attribs );
                $buttons['diff'] = new OOUI\ButtonInputWidget( [
+                       'name' => 'wpDiff',
+                       'tabIndex' => ++$tabindex,
                        'id' => 'wpDiffWidget',
                        'inputId' => 'wpDiff',
                        // Support: IE 6 – Use <input>, otherwise it can't distinguish which button was clicked
@@ -4443,7 +4435,7 @@ class EditPage {
                        'type' => 'submit',
                        'title' => Linker::titleAttrib( 'diff' ),
                        'accessKey' => Linker::accesskey( 'diff' ),
-               ] + $diffConfig );
+               ] );
 
                // Avoid PHP 7.1 warning of passing $this by reference
                $editPage = $this;