MDL-18094: course/viewhiddenactivities didn't work (in some parts of the code) at...

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index be746f941e9c84fbebb8cb133e1288d566183310..77a8470addf430e1c87c19557e9d06ba4d692a22 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2149,7 +2149,7 @@ function require_login($courseorid=0, $autologinguest=true, $cm=null, $setwantsu
 
         /// Make sure they can read this activity too, if specified
 
-            if (!empty($cm) and !$cm->visible and !has_capability('moodle/course:viewhiddenactivities', $cm->context)) {
+            if (!empty($cm) && !$cm->visible && !has_capability('moodle/course:viewhiddenactivities', $cm->context)) {
                 redirect($CFG->wwwroot.'/course/view.php?id='.$cm->course, get_string('activityiscurrentlyhidden'));
             }
             user_accesstime_log($COURSE->id); /// Access granted, update lastaccess times