MDL-12695 Symantec Norton internet security pop up blocker seems to be stopping user...

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index df3aff401b13e34c4c56d02fa1636183f814e7dd..ac6a87514eb504f608bf286b211552962ef1609d 100644 (file)
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -399,14 +399,16 @@
             if ($unfinished) {
                 $strconfirmstartattempt = '';
             } else if ($quiz->timelimit && $quiz->attempts) {
-                $strconfirmstartattempt = addslashes(get_string('confirmstartattempttimelimit','quiz', $quiz->attempts));
+                $strconfirmstartattempt = get_string('confirmstartattempttimelimit','quiz', $quiz->attempts);
             } else if ($quiz->timelimit) {
-                $strconfirmstartattempt = addslashes(get_string('confirmstarttimelimit','quiz'));
+                $strconfirmstartattempt = get_string('confirmstarttimelimit','quiz');
             } else if ($quiz->attempts) {
-                $strconfirmstartattempt = addslashes(get_string('confirmstartattemptlimit','quiz', $quiz->attempts));
+                $strconfirmstartattempt = get_string('confirmstartattemptlimit','quiz', $quiz->attempts);
             } else {
                 $strconfirmstartattempt =  '';
             }
+            // Determine the URL to use.
+            $attempturl = "attempt.php?id=$cm->id";
 
             // Prepare options depending on whether the quiz should be a popup.
             if (!empty($quiz->popup)) {
@@ -415,22 +417,20 @@
                         "width='+window.screen.width+', channelmode=yes, fullscreen=yes, " .
                         "scrollbars=yes, resizeable=no, directories=no, toolbar=no, " .
                         "titlebar=no, location=no, status=no, menubar=no";
+                   if (!empty($CFG->usesid) && !isset($_COOKIE[session_name()])) {
+                       $attempturl = sid_process_url($attempturl);
+                   }
+                   
+                   echo '<input type="button" value="'.$buttontext.'" onclick="javascript:';
+                   if ($strconfirmstartattempt) {
+                       $strconfirmstartattempt = addslashes($strconfirmstartattempt);
+                       echo "if (confirm('".addslashes_js($strconfirmstartattempt)."')) ";
+                   } 
+                   echo "window.open('$attempturl','$window','$windowoptions');", '" />';   
             } else {
-                $window = '_self';
-                $windowoptions = '';
+               print_single_button("attempt.php", array('id'=>$cm->id), $buttontext, 'get', '', false, '', false, $strconfirmstartattempt);
             }
 
-            // Determine the URL to use.
-            $attempturl = "attempt.php?id=$cm->id";
-            if (!empty($CFG->usesid) && !isset($_COOKIE[session_name()])) {
-                $attempturl = sid_process_url($attempturl);
-            }
-            
-            echo '<input type="button" value="'.$buttontext.'" onclick="javascript:';
-            if ($strconfirmstartattempt) {
-                echo "if (confirm('".addslashes_js($strconfirmstartattempt)."')) ";
-            } 
-            echo "window.open('$attempturl','$window','$windowoptions');", '" />';   
 
 ?>
 <noscript>