Merged fixes from stable

diff --git a/lib/datalib.php b/lib/datalib.php
index 15434e7e4d297f7ca82df36dba09eeff8100460e..18a3118e66d617635ac0de1dd7bbc5d1cb7017e8 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -3111,6 +3111,8 @@ function check_db_compat() {
 }
 
 function course_parent_visible($course = null) {
+    global $CFG;
+
     if (empty($course)) {
         return true;
     }

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index bacf39e7ccd7b3ed2ac04d02c36bb63ced67e099..5645c85f921a435c25247abfdc44841ac43461a1 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1591,7 +1591,7 @@ function require_login($courseid=0, $autologinguest=true, $cm=null) {
         if (! $course = get_record('course', 'id', $courseid)) {
             error('That course doesn\'t exist');
         }
-        if (!(isteacher($courseid) || !empty($USER->admin)) && (!$course->visible || !course_parent_visible($course))) {
+        if (!isteacher($courseid) && !($course->visible && course_parent_visible($course))) {
             print_header();
             notice(get_string('coursehidden'), $CFG->wwwroot .'/');
         }