Merge branch 'master' of github.com:brettp/Elgg

1 files changed, 15 insertions, 6 deletions

diff --git a/views/default/input/dropdown.php b/views/default/input/dropdown.php
index fccccb888..4673a9301 100644
--- a/views/default/input/dropdown.php
+++ b/views/default/input/dropdown.php
@@ -3,7 +3,7 @@
  * Elgg dropdown input
  * Displays a dropdown (select) input field
  *
- * @warning Default values of FALSE or NULL will match '' (empty string) and not 0.
+ * @warning Default values of FALSE or NULL will match '' (empty string) but not 0.
  *
  * @package Elgg
  * @subpackage Core
@@ -14,13 +14,24 @@
  *                               where "value" is an internal name and "option" is
  * 								 the value displayed on the button. Replaces
  *                               $vars['options'] when defined.
+ * @uses $vars['class']          Additional CSS class
  */
 
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-dropdown {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-dropdown";
+}
+
 $defaults = array(
-	'class' => 'elgg-input-dropdown', 
-	'disabled' => FALSE,
+	'disabled' => false,
+	'value' => '',
+	'options_values' => array(),
+	'options' => array(),
 );
 
+$vars = array_merge($defaults, $vars);
+
 $options_values = $vars['options_values'];
 unset($vars['options_values']);
 
@@ -30,10 +41,8 @@ unset($vars['options']);
 $value = $vars['value'];
 unset($vars['value']);
 
-$attrs = array_merge($defaults, $vars);
-
 ?>
-<select <?php echo elgg_format_attributes($attrs); ?>>
+<select <?php echo elgg_format_attributes($vars); ?>>
 <?php
 
 if ($options_values) {