Merge "HTMLForm: Do not render hidden elements as elements"

diff --combined includes/htmlform/HTMLForm.php
index 2b9a49a,94aae3c..78dbd30
--- 1/includes/htmlform/HTMLForm.php
--- 2/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@@ -1359,18 -1359,6 +1359,18 @@@ class HTMLForm extends ContextSource 
                return $this->mMethod;
        }
  
 +      /**
 +       * Wraps the given $section into an user-visible fieldset.
 +       *
 +       * @param string $legend Legend text for the fieldset
 +       * @param string $section The section content in plain Html
 +       * @param array $attributes Additional attributes for the fieldset
 +       * @return string The fieldset's Html
 +       */
 +      protected function wrapFieldSetSection( $legend, $section, $attributes ) {
 +              return Xml::fieldset( $legend, $section, $attributes ) . "\n";
 +      }
 +
        /**
         * @todo Document
         *
@@@ -1402,16 -1390,19 +1402,19 @@@
                                $v = empty( $value->mParams['nodata'] )
                                        ? $this->mFieldData[$key]
                                        : $value->getDefault();
-                               $html[] = $value->$getFieldHtmlMethod( $v );
  
-                               $labelValue = trim( $value->getLabel() );
-                               if ( $labelValue != ' ' && $labelValue !== '' ) {
-                                       $hasLabel = true;
-                               }
+                               $retval = $value->$getFieldHtmlMethod( $v );
+ 
+                               // check, if the form field should be added to
+                               // the output.
+                               if ( $value->hasVisibleOutput() ) {
+                                       $html[] = $retval;
+ 
+                                       $labelValue = trim( $value->getLabel() );
+                                       if ( $labelValue != ' ' && $labelValue !== '' ) {
+                                               $hasLabel = true;
+                                       }
  
-                               if ( get_class( $value ) !== 'HTMLHiddenField' &&
-                                       get_class( $value ) !== 'HTMLApiField'
-                               ) {
                                        $hasUserVisibleFields = true;
                                }
                        } elseif ( is_array( $value ) ) {
@@@ -1437,7 -1428,7 +1440,7 @@@
                                        if ( $fieldsetIDPrefix ) {
                                                $attributes['id'] = Sanitizer::escapeId( "$fieldsetIDPrefix$key" );
                                        }
 -                                      $subsectionHtml .= Xml::fieldset( $legend, $section, $attributes ) . "\n";
 +                                      $subsectionHtml .= $this->wrapFieldSetSection( $legend, $section, $attributes );
                                } else {
                                        // Just return the inputs, nothing fancy.
                                        $subsectionHtml .= $section;