Correct logic for stopping people using guest access from doing quizzes. Merged from...

diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
index 960f172765dad77e86db900392ccee350b1e02bc..cdbd50184f6827268d59c01d5b4a54ade11f3d81 100644 (file)
--- a/mod/quiz/attempt.php
+++ b/mod/quiz/attempt.php
@@ -108,7 +108,7 @@
     }
 
 /// Check availability
-    if (isguest()) {
+    if (isguestuser()) {
         print_heading(get_string('guestsno', 'quiz'));
         if (empty($popup)) {
             print_footer($course);

diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index 1c26656fcad56564711b74035125474c5335abad..82cd59f2805cf8141d1c46c1d5ddb6357a899195 100644 (file)
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -137,7 +137,7 @@
     //
     // So for courses that allow guest access, it is good to offer people an easy
     // way to log in at this point if they have got this far before logging in.
-    if (isguest()) {
+    if (isguestuser()) {
         $loginurl = $CFG->wwwroot.'/login/index.php';
         if (!empty($CFG->loginhttps)) {
             $loginurl = str_replace('http:','https:', $loginurl);