Merge branch 'MDL-43232-master' of git://github.com/andrewnicols/moodle

diff --combined backup/util/ui/base_moodleform.class.php
index 762ea70,8c51dd5..9866705
--- 1/backup/util/ui/base_moodleform.class.php
--- 2/backup/util/ui/base_moodleform.class.php
+++ b/backup/util/ui/base_moodleform.class.php
@@@ -73,14 -73,6 +73,14 @@@ abstract class base_moodleform extends 
       */
      function __construct(base_ui_stage $uistage, $action=null, $customdata=null, $method='post', $target='', $attributes=null, $editable=true) {
          $this->uistage = $uistage;
 +        // Add a class to the attributes to prevent the default collapsible behaviour.
 +        if (!$attributes) {
 +            $attributes = array();
 +        }
 +        $attributes['class'] = 'unresponsive';
 +        if (!isset($attributes['enctype'])) {
 +            $attributes['enctype'] = 'application/x-www-form-urlencoded'; // Enforce compatibility with our max_input_vars hack.
 +        }
          parent::__construct($action, $customdata, $method, $target, $attributes, $editable);
      }
      /**
@@@ -348,7 -340,7 +348,7 @@@
          $config->yesLabel = get_string('confirmcancelyes', 'backup');
          $config->noLabel = get_string('confirmcancelno', 'backup');
          $config->closeButtonTitle = get_string('close', 'editor');
-         $PAGE->requires->yui_module('moodle-backup-confirmcancel', 'M.core_backup.watch_cancel_buttons', array($config));
+         $PAGE->requires->yui_module('moodle-backup-confirmcancel', 'M.core_backup.confirmcancel.watch_cancel_buttons', array($config));
  
          // Get list of module types on course.
          $modinfo = get_fast_modinfo($COURSE);