From: Andrew Davis Date: Thu, 10 Dec 2009 02:29:53 +0000 (+0000) Subject: quiz MDL-10128 popup checker no longer requests a non-existent file which was causing... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=496e3ccdd2585b026b79a2a8927eb6a2f54aa755;p=moodle.git quiz MDL-10128 popup checker no longer requests a non-existent file which was causing messages in server logs --- diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 71b9575539..c64271a640 100644 --- 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 45a38fd8dc..093135aba6 100644 --- 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');