Skip to content
Browse files

Merge branch 'MDL-36934-master' of git://git.luns.net.uk/moodle

  • Loading branch information...
2 parents 552160e + 50d6ad8 commit e9dab879b647fb034358948fe17cc9164ab692ad @stronk7 stronk7 committed Dec 3, 2012
Showing with 8 additions and 2 deletions.
  1. +8 −2 lib/outputrenderers.php
View
10 lib/outputrenderers.php
@@ -1565,9 +1565,15 @@ protected function render_url_select(url_select $select) {
$output .= html_writer::label($select->label, $select->attributes['id'], false, $select->labelattributes);
}
- $select->attributes['class'] = 'autosubmit';
+ $classes = array();
+ if (!$select->showbutton) {
+ $classes[] = 'autosubmit';
+ }
if ($select->class) {
- $select->attributes['class'] .= ' ' . $select->class;
+ $classes[] = $select->class;
+ }
+ if (count($classes)) {
+ $select->attributes['class'] = implode(' ', $classes);
}
if ($select->helpicon instanceof help_icon) {

0 comments on commit e9dab87

Please sign in to comment.
Something went wrong with that request. Please try again.