From: sam_marshall <sam_marshall>
Date: Fri, 3 Apr 2009 13:11:05 +0000 (+0000)
Subject: MDL-18094: course/viewhiddenactivities didn't work (in some parts of the code) at... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=2bf69a8588f306cd11bd2f981a81e8e314605dfb;p=moodle.git

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

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index be746f941e..77a8470add 100644
--- 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