Merge branch 'MDL-25971' of git://github.com/timhunt/moodle

moodle · Jan 17, 2011 · c4592a2 · c4592a2
2 parents 616e81c + 1a09fa6
commit c4592a2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
@@ -1038,6 +1038,12 @@ public static function select(array $options, $name, $selected = '', $nothing =
 
         $attributes['name'] = $name;
 
+        if (!empty($attributes['disabled'])) {
+            $attributes['disabled'] = 'disabled';
+        } else {
+            unset($attributes['disabled']);
+        }
+
         $output = '';
         foreach ($options as $value=>$label) {
             if (is_array($label)) {