MDL-12433: course/info respect the $CFG->allowvisiblecoursesinhiddencategories setting

Credit goes to Petr Kalis

diff --git a/course/info.php b/course/info.php
index d2dddba98e5960bf0aeb615069af6db56af148f3..27354c9eef4df8b6f62881ea25eaa8d10e5636e6 100644 (file)
--- a/course/info.php
+++ b/course/info.php
@@ -28,7 +28,8 @@
         require_login();
     }
 
-    if (!(course_parent_visible($course) || $course->visible) && !has_capability('moodle/course:viewhiddencourses', $context)) {
+    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+    if ((!(course_parent_visible($course) && $CFG->allowvisiblecoursesinhiddencategories) || (! $course->visible)) && !has_capability('moodle/course:viewhiddencourses', $context)) {
         error(get_string('coursehidden'), $CFG->wwwroot .'/'); 
     }  
     
@@ -54,7 +55,7 @@
 
     echo filter_text(text_to_html($course->summary),$course->id);
 
-    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+
     if ($managerroles = get_config('', 'coursemanager')) {
         $coursemanagerroles = split(',', $managerroles);
         foreach ($coursemanagerroles as $roleid) {