From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Mon, 7 Sep 2009 01:48:06 +0000 (+0000)
Subject: Don't output for= that doesn't point anywhere
X-Git-Tag: 1.31.0-rc.0~39885
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=650e0d72ac31e002003a7a1bf36f9571cdd78bd2;p=lhc%2Fweb%2Fwiklou.git

Don't output for= that doesn't point anywhere

This fixes an HTML validity issue with HTMLForm.
---

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 335efeaed4..d66f859907 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -384,6 +384,16 @@ abstract class HTMLFormField {
 		return $value;
 	}
 
+	/**
+	 * Should this field have a label, or is there no input element with the
+	 * appropriate id for the label to point to?
+	 *
+	 * @return bool True to output a label, false to suppress
+	 */
+	protected function needsLabel() {
+		return true;
+	}
+
 	function loadDataFromRequest( $request ) {
 		if( $request->getCheck( $this->mName ) ) {
 			return $request->getText( $this->mName );
@@ -455,8 +465,14 @@ abstract class HTMLFormField {
 
 		$html = '';
 
+		# Don't output a for= attribute for labels with no associated input.
+		# Kind of hacky here, possibly we don't want these to be <label>s at all.
+		$for = array();
+		if ( $this->needsLabel() ) {
+			$for['for'] = $this->mID;
+		}
 		$html .= Html::rawElement( 'td', array( 'class' => 'mw-label' ),
-					Html::rawElement( 'label', array( 'for' => $this->mID ), $this->getLabel() )
+					Html::rawElement( 'label', $for, $this->getLabel() )
 				);
 		$html .= Html::rawElement( 'td', array( 'class' => 'mw-input' ),
 							$this->getInputHTML( $value ) ."\n$errors" );
@@ -837,6 +853,10 @@ class HTMLMultiSelectField extends HTMLFormField {
 			return array();
 		}
 	}
+
+	protected function needsLabel() {
+		return false;
+	}
 }
 
 class HTMLRadioField extends HTMLFormField {
@@ -886,6 +906,10 @@ class HTMLRadioField extends HTMLFormField {
 
 		return $html;
 	}
+
+	protected function needsLabel() {
+		return false;
+	}
 }
 
 class HTMLInfoField extends HTMLFormField {
@@ -906,4 +930,8 @@ class HTMLInfoField extends HTMLFormField {
 
 		return parent::getTableRow( $value );
 	}
+
+	protected function needsLabel() {
+		return false;
+	}
 }