1 files changed, 25 insertions, 26 deletions
diff --git a/views/default/input/text.php b/views/default/input/text.php
index a6045cf4c..07ce5c710 100644
--- a/views/default/input/text.php
+++ b/views/default/input/text.php
@@ -1,27 +1,26 @@
-<?php
-
-	/**
-	 * Elgg text input
-	 * Displays a text input field
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008
-	 * @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
-	 * @uses $vars['disabled'] If true then control is read-only
-	 * @uses $vars['class'] Class override
-	 */
+<?php
+/**
+ * Elgg text input
+ * Displays a text input field
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['class'] Additional CSS class
+ */
 
-	
-	$class = $vars['class'];
-	if (!$class) $class = "input-text";
-	
-?>
-
-<input type="text" <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" value="<?php echo htmlentities($vars['value'], null, 'UTF-8'); ?>" class="<?php echo $class ?>"/> 
-\ No newline at end of file
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-text {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-text";
+}
+
+$defaults = array(
+	'value' => '',
+	'disabled' => false,
+);
+
+$vars = array_merge($defaults, $vars);
+
+?>
+<input type="text" <?php echo elgg_format_attributes($vars); ?> />
+\ No newline at end of file