1 files changed, 8 insertions, 5 deletions
diff --git a/views/default/input/password.php b/views/default/input/password.php
index 86bae9c7f..1bd70a419 100644
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -12,10 +12,13 @@
  *
  */
 
-$class = $vars['class'];
-if (!$class) {
-	$class = "elgg-input-password";
-}
+$defaults = array(
+	'class' => 'elgg-input-password',
+	'disabled' => FALSE,
+	
+)
+
+$attrs = array_merge($defaults, $vars);
 ?>
 
-<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
+<input type="password" <?php echo elgg_format_attributes($attrs); ?> />
+\ No newline at end of file