Guests can no longer see email addresses if "show only to course participants"

has been set by that user

diff --git a/lib/weblib.php b/lib/weblib.php
index 4a47942c5bf7808e4acef46faf948eaa5d1ea221..11616123a5ea75622ff53d5704c69e78160d521c 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1230,7 +1230,7 @@ function print_user($user, $course) {
     if (!empty($user->role) and ($user->role <> $course->teacher)) {
         echo "$string->role: $user->role<br />";
     }
-    if ($user->maildisplay == 1 or ($user->maildisplay == 2 and $course->category) or $isteacher) {
+    if ($user->maildisplay == 1 or ($user->maildisplay == 2 and $course->category and !isguest()) or $isteacher) {
         echo "$string->email: <a href=\"mailto:$user->email\">$user->email</a><br />";
     }
     if ($user->city or $user->country) {

diff --git a/user/view.php b/user/view.php
index 249ed574e513fda01b8e2dd471578d8896bd645f..2bf5002f1cb668a5e7df6d52367c94be7181d33b 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -124,7 +124,9 @@
         }
     }
 
-    if ($user->maildisplay == 1 or ($user->maildisplay == 2 and $course->category) or isteacher($course->id)) {
+    if ($user->maildisplay == 1 or 
+       ($user->maildisplay == 2 and $course->category and !isguest()) or 
+       isteacher($course->id)) {
 
         if (isteacheredit($course->id) or $currentuser) {   /// Can use the enable/disable email stuff
             if (!empty($_GET['enable'])) {     /// Recieved a paramter to enable the email address