1 files changed, 25 insertions, 21 deletions
diff --git a/views/default/input/password.php b/views/default/input/password.php
index 9a7e678fb..45f2b20a6 100644
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -1,24 +1,28 @@
-<?php
-
-	/**
-	 * Elgg password input
-	 * Displays a password input field
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
+<?php
+/**
+ * Elgg password input
+ * Displays a password input field
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['value'] The current value, if any
+ * @uses $vars['name']  The name of the input field
+ * @uses $vars['class'] Additional CSS class
+ */
 
-	 * @author Curverider Ltd
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-password {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-password";
+}
 
-	 * @link http://elgg.org/
-	 * 
-	 * @uses $vars['value'] The current value, if any
-	 * @uses $vars['js'] Any Javascript to enter into the input tag
-	 * @uses $vars['internalname'] The name of the input field
-	 * 
-	 */
+$defaults = array(
+	'disabled' => false,
+	'value' => '',
+);
 
-	$class = $vars['class'];
-	if (!$class) $class = "input-password";
-?>
-
-<input type="password" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>" /> 
-\ No newline at end of file
+$attrs = array_merge($defaults, $vars);
+?>
+
+<input type="password" <?php echo elgg_format_attributes($attrs); ?> />