MDL-20636 Merge vle/master into ouqe2

Conflicts:
	mod/quiz/locallib.php
	mod/quiz/report/overview/overview_table.php
	mod/quiz/report/overview/report.php
	mod/quiz/report/responses/report.php
	question/type/random/questiontype.php

diff --cc lib/adminlib.php
Simple merge

diff --cc lib/moodlelib.php
Simple merge

diff --cc mod/quiz/backup/moodle2/backup_quiz_stepslib.php
Simple merge

diff --cc mod/quiz/backup/moodle2/restore_quiz_stepslib.php
Simple merge

diff --cc mod/quiz/locallib.php
index b35d13b,06914cd..a6da4d9
--- 1/mod/quiz/locallib.php
--- 2/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@@ -1133,9 -1000,9 +1133,9 @@@ function quiz_get_slot_for_question($qu
  /**
   * Sends confirmation email to the student taking the course
   *
 - * @param stdClass $a associative array of replaceable fields for the templates
 + * @param object $a associative array of replaceable fields for the templates
   *
-  * @return bool|string result of events_triger
+  * @return bool
   */
  function quiz_send_confirmation($a) {
  
@@@ -1174,9 -1041,9 +1174,9 @@@
   * Sends notification messages to the interested parties that assign the role capability
   *
   * @param object $recipient user object of the intended recipient
 - * @param stdClass $a associative array of replaceable fields for the templates
 + * @param object $a associative array of replaceable fields for the templates
   *
-  * @return bool|string result of events_triger()
+  * @return bool
   */
  function quiz_send_notification($recipient, $a) {
  

diff --cc question/format/gift/simpletest/testgiftformat.php
Simple merge

diff --cc question/qengine.js
index 0e448f8,36bf82c..4dcc257
--- 1/question/qengine.js
--- 2/question/qengine.js
+++ b/question/qengine.js
@@@ -149,12 -13,9 +149,12 @@@ M.core_question_engine.init_submit_butt
   */
  M.core_question_engine.init_form = function(Y, form) {
      Y.one(form).setAttribute('autocomplete', 'off');
 +
 +    Y.on('submit', M.core_question_engine.prevent_repeat_submission, form, form, Y);
 +
      Y.on('key', function (e) {
          if (!e.target.test('a') && !e.target.test('input[type=submit]') &&
-                 !e.target.test('input[type=img]')) {
+                 !e.target.test('input[type=img]') && !e.target.test('textarea')) {
              e.preventDefault();
          }
      }, form, 'press:13');

diff --cc question/type/numerical/questiontype.php
Simple merge

diff --cc question/type/random/backup/moodle2/restore_qtype_random_plugin.class.php
Simple merge