1 files changed, 28 insertions, 23 deletions
diff --git a/views/default/input/file.php b/views/default/input/file.php
index ec961b6d0..452fe72b9 100644
--- a/views/default/input/file.php
+++ b/views/default/input/file.php
@@ -1,26 +1,31 @@
-<?php
-
-	/**
-	 * Elgg file input
-	 * Displays a file input field
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
+<?php
+/**
+ * Elgg file input
+ * Displays a file input field
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['value'] The current value if any
+ * @uses $vars['class'] Additional CSS class
+ */
 
-	 * @author Curverider Ltd
+if (!empty($vars['value'])) {
+	echo elgg_echo('fileexists') . "<br />";
+}
 
-	 * @link http://elgg.org/
-	 * 
-	 * @uses $vars['js'] Any Javascript to enter into the input tag
-	 * @uses $vars['internalname'] The name of the input field
-	 * 
-	 */
-
-    if (!empty($vars['value'])) {
-        echo elgg_echo('fileexists') . "<br />";
-    }
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-file {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-file";
+}
 
-    $class = $vars['class'];
-	if (!$class) $class = "input-file";
-?>
-<input type="file" size="30" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>" />
-\ No newline at end of file
+$defaults = array(
+	'disabled' => false,
+	'size' => 30,
+);
+
+$attrs = array_merge($defaults, $vars);
+
+?>
+<input type="file" <?php echo elgg_format_attributes($attrs); ?> />