X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fhtmlform%2FHTMLTextField.php;h=e584d886c4c4390964fcb98e282751ff4636e26b;hb=c7d2fb7f7241b0f8a3849e87127a9204e5a19ef3;hp=fe962f4ac1dc30336a89e088a648c6c0c52d85df;hpb=38a47b9fcabd26bbb48273ce74f5a432f3b705f5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/htmlform/HTMLTextField.php b/includes/htmlform/HTMLTextField.php
index fe962f4ac1..e584d886c4 100644
--- a/includes/htmlform/HTMLTextField.php
+++ b/includes/htmlform/HTMLTextField.php
@@ -17,10 +17,6 @@ class HTMLTextField extends HTMLFormField {
 			$attribs['class'] = $this->mClass;
 		}
 
-		if ( !empty( $this->mParams['disabled'] ) ) {
-			$attribs['disabled'] = 'disabled';
-		}
-
 		# @todo Enforce pattern, step, required, readonly on the server side as
 		# well
 		$allowedParams = array(
@@ -31,28 +27,22 @@ class HTMLTextField extends HTMLFormField {
 			'step',
 			'placeholder',
 			'list',
-			'maxlength'
+			'maxlength',
+			'tabindex',
+			'disabled',
+			'required',
+			'autofocus',
+			'multiple',
+			'readonly'
 		);
-		foreach ( $allowedParams as $param ) {
-			if ( isset( $this->mParams[$param] ) ) {
-				$attribs[$param] = $this->mParams[$param];
-			}
-		}
 
-		foreach ( array( 'required', 'autofocus', 'multiple', 'readonly' ) as $param ) {
-			if ( isset( $this->mParams[$param] ) ) {
-				$attribs[$param] = '';
-			}
-		}
+		$attribs += $this->getAttributes( $allowedParams );
 
 		# Implement tiny differences between some field variants
 		# here, rather than creating a new class for each one which
 		# is essentially just a clone of this one.
 		if ( isset( $this->mParams['type'] ) ) {
 			switch ( $this->mParams['type'] ) {
-				case 'email':
-					$attribs['type'] = 'email';
-					break;
 				case 'int':
 					$attribs['type'] = 'number';
 					break;
@@ -61,8 +51,10 @@ class HTMLTextField extends HTMLFormField {
 					$attribs['step'] = 'any';
 					break;
 				# Pass through
+				case 'email':
 				case 'password':
 				case 'file':
+				case 'url':
 					$attribs['type'] = $this->mParams['type'];
 					break;
 			}