Merge "Fix HTML output arround HTMLForm's submit buttons when in vform"

diff --cc includes/htmlform/HTMLForm.php
index f3b7ce7,6af2f5f..422fa8a
--- 1/includes/htmlform/HTMLForm.php
--- 2/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@@ -812,24 -809,10 +812,17 @@@ class HTMLForm extends ContextSource 
                        if ( $this->isVForm() ) {
                                // mw-ui-block is necessary because the buttons aren't necessarily in an
                                // immediate child div of the vform.
 -                              array_push( $attribs['class'], 'mw-ui-button', 'mw-ui-big', 'mw-ui-primary', 'mw-ui-block' );
 +                              // @todo Let client specify if the primary submit button is progressive or destructive
 +                              array_push(
 +                                      $attribs['class'],
 +                                      'mw-ui-button',
 +                                      'mw-ui-big',
 +                                      'mw-ui-constructive',
 +                                      'mw-ui-block'
 +                              );
                        }
  
-                       $html .= Xml::submitButton( $this->getSubmitText(), $attribs ) . "\n";
- 
-                       // Buttons are top-level form elements in table and div layouts,
-                       // but vform wants all elements inside divs to get spaced-out block
-                       // styling.
-                       if ( $this->isVForm() ) {
-                               $html = Html::rawElement( 'div', null, "\n$html\n" );
-                       }
+                       $buttons .= Xml::submitButton( $this->getSubmitText(), $attribs ) . "\n";
                }
  
                if ( $this->mShowReset ) {