Merge branch 'mw-1.26'

1 files changed, 4 insertions, 2 deletions

diff --git a/includes/htmlform/VFormHTMLForm.php b/includes/htmlform/VFormHTMLForm.php
index 0c0e4252..3788379d 100644
--- a/includes/htmlform/VFormHTMLForm.php
+++ b/includes/htmlform/VFormHTMLForm.php
@@ -65,7 +65,7 @@ class VFormHTMLForm extends HTMLForm {
 
 	protected function getFormAttributes() {
 		$attribs = parent::getFormAttributes();
-		array_push( $attribs['class'], 'mw-ui-vform', 'mw-ui-container' );
+		$attribs['class'] = array( 'mw-ui-vform', 'mw-ui-container', 'visualClear' );
 		return $attribs;
 	}
 
@@ -95,8 +95,10 @@ class VFormHTMLForm extends HTMLForm {
 			$attribs['class'] = array(
 				'mw-htmlform-submit',
 				'mw-ui-button mw-ui-big mw-ui-block',
-				$this->mSubmitModifierClass,
 			);
+			foreach ( $this->mSubmitFlags as $flag ) {
+				$attribs['class'][] = 'mw-ui-' . $flag;
+			}
 
 			$buttons .= Xml::submitButton( $this->getSubmitText(), $attribs ) . "\n";
 		}