Skip to content
Browse files

Merge branch 'MDL-34187_23' of git://github.com/timhunt/moodle into M…

…OODLE_23_STABLE
  • Loading branch information...
2 parents 5f3d7b1 + e9879c0 commit 00714e72ea396097c1c38f5e462693bf3b91406e @danpoltawski danpoltawski committed
Showing with 4 additions and 4 deletions.
  1. +1 −1 mod/quiz/module.js
  2. +2 −2 mod/quiz/renderer.php
  3. +1 −1 mod/quiz/version.php
View
2 mod/quiz/module.js
@@ -275,7 +275,7 @@ M.mod_quiz.secure_window = {
}, '#secureclosebutton');
},
- close: function(url, delay) {
+ close: function(Y, url, delay) {
setTimeout(function() {
if (window.opener) {
window.opener.document.location.reload();
View
4 mod/quiz/renderer.php
@@ -509,8 +509,8 @@ public function close_attempt_popup($url, $message = '') {
$output .= html_writer::tag('p', get_string('pleaseclose', 'quiz'));
$delay = 0;
}
- $this->page->requires->js_function_call('M.mod_quiz.secure_window.close',
- array($url, $delay));
+ $this->page->requires->js_init_call('M.mod_quiz.secure_window.close',
+ array($url, $delay), false, quiz_get_js_module());
$output .= $this->box_end();
$output .= $this->footer();
View
2 mod/quiz/version.php
@@ -25,7 +25,7 @@
defined('MOODLE_INTERNAL') || die();
-$module->version = 2012061700; // The current module version (Date: YYYYMMDDXX).
+$module->version = 2012061701; // The current module version (Date: YYYYMMDDXX).
$module->requires = 2012061700; // Requires this Moodle version.
$module->component = 'mod_quiz'; // Full name of the plugin (used for diagnostics).
$module->cron = 60;

0 comments on commit 00714e7

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