Refs #2143: DRY up input/tags

git-svn-id: http://code.elgg.org/elgg/trunk@7359 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 15 insertions, 33 deletions

diff --git a/views/default/input/tags.php b/views/default/input/tags.php
index 5a7ca4ef3..1cafb7904 100644
--- a/views/default/input/tags.php
+++ b/views/default/input/tags.php
@@ -5,50 +5,32 @@
  *
  * @package Elgg
  * @subpackage Core
-
-
- *
- * @uses $vars['value'] The current value, if any - string or array - tags will be encoded
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
- * @uses $vars['internalid'] The id of the input field
- * @uses $vars['class'] CSS class override
- * @uses $vars['disabled'] Is the input field disabled?
  */
 
+$defaults = array(
+	'class' => 'input_tags',
+	'disabled' => FALSE,
+);
 
-$class = "input_tags";
-if (isset($vars['class'])) {
-	$class = $vars['class'];
-}
-
-$disabled = false;
-if (isset($vars['disabled'])) {
-	$disabled = $vars['disabled'];
-}
+$vars = array_merge($defaults, $vars);
 
 if (!isset($vars['value']) || $vars['value'] === FALSE) {
 	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
 }
 
-$tags = "";
-if (!empty($vars['value'])) {
-	if (is_array($vars['value'])) {
-		foreach($vars['value'] as $tag) {
+if (is_array($vars['value'])) {
+	$tags = array();
 
-			if (!empty($tags)) {
-				$tags .= ", ";
-			}
-			if (is_string($tag)) {
-				$tags .= $tag;
-			} else {
-				$tags .= $tag->value;
-			}
+	foreach ($vars['value'] as $tag) {
+		if (is_string($tag)) {
+			$tags[] = $tag;
+		} else {
+			$tags[] = $tag->value;
 		}
-	} else {
-		$tags = $vars['value'];
 	}
+
+	$vars['value'] = implode(", ", $tags);
 }
 
 ?>
-<input type="text" <?php if ($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($tags, ENT_QUOTES, 'UTF-8'); ?>" class="<?php echo $class; ?>"/>
\ No newline at end of file
+<input type="text" <?php echo elgg_format_attributes($vars); ?> />
\ No newline at end of file