quiz MDL-10128 popup checker no longer requests a non-existent file which was causing...

diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index 71b95755394712c491cafcac075fe581a99f3555..c64271a640e4b7c1e1a5f43d834defa03f3eb3ba 100644 (file)
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -1,7 +1,7 @@
 // Miscellaneous core Javascript functions for Moodle
 
 function popupchecker(msg) {
-    var testwindow = window.open('itestwin.html', '', 'width=1,height=1,left=0,top=0,scrollbars=no');
+    var testwindow = window.open('', '', 'width=1,height=1,left=0,top=0,scrollbars=no');
     if (!testwindow) {
         alert(msg);
     } else {

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index 45a38fd8dc891e3af4e8a8f898194361ea1757e4..093135aba63bae9db06e66f05e923c574f553c14 100644 (file)
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -63,10 +63,8 @@
         $USER->editing = $edit;
     }
 
-/// Print the page header
-    $bodytags = '';
     if ($accessmanager->securewindow_required($canpreview)) {
-        $bodytags = 'onload="popupchecker(\'' . get_string('popupblockerwarning', 'quiz') . '\');"';
+        $PAGE->requires->js_function_call('popupchecker',array(get_string('popupblockerwarning', 'quiz')));
     }
     $PAGE->requires->yui_lib('event');