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

diff --cc course/category.php
Simple merge

diff --cc course/search.php
Simple merge

diff --cc lib/javascript-static.js
Simple merge

diff --cc lib/outputrenderers.php
index 55d38f1,1c68712..616865b
--- 1/lib/outputrenderers.php
--- 2/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@@ -1488,10 -1369,13 +1493,13 @@@ class core_renderer extends renderer_ba
          $output .= html_writer::select($select->options, $select->name, $select->selected, $select->nothing, $select->attributes);
  
          $go = html_writer::empty_tag('input', array('type'=>'submit', 'value'=>get_string('go')));
 -        $output .= html_writer::tag('noscript', html_writer::tag('div', $go), array('style'=>'inline'));
 +        $output .= html_writer::tag('noscript', html_writer::tag('div', $go), array('class' => 'inline'));
  
          $nothing = empty($select->nothing) ? false : key($select->nothing);
-         $this->page->requires->js_init_call('M.util.init_select_autosubmit', array($select->formid, $select->attributes['id'], $nothing));
+         $this->page->requires->yui_module('moodle-core-formautosubmit',
+             'M.core.init_formautosubmit',
+             array(array('selectid' => $select->attributes['id'], 'nothing' => $nothing))
+         );
  
          // then div wrapper for xhtml strictness
          $output = html_writer::tag('div', $output);
@@@ -1612,9 -1501,12 +1625,12 @@@
  
          if (!$select->showbutton) {
              $go = html_writer::empty_tag('input', array('type'=>'submit', 'value'=>get_string('go')));
 -            $output .= html_writer::tag('noscript', html_writer::tag('div', $go), array('style'=>'inline'));
 +            $output .= html_writer::tag('noscript', html_writer::tag('div', $go), array('class' => 'inline'));
              $nothing = empty($select->nothing) ? false : key($select->nothing);
-             $output .= $this->page->requires->js_init_call('M.util.init_select_autosubmit', array($select->formid, $select->attributes['id'], $nothing));
+             $this->page->requires->yui_module('moodle-core-formautosubmit',
+                 'M.core.init_formautosubmit',
+                 array(array('selectid' => $select->attributes['id'], 'nothing' => $nothing))
+             );
          } else {
              $output .= html_writer::empty_tag('input', array('type'=>'submit', 'value'=>$select->showbutton));
          }

diff --cc lib/upgrade.txt
Simple merge