Merged fixes from stable (undoing category visibility changes)

diff --git a/lib/datalib.php b/lib/datalib.php
index ede7e629882138a29da3e280cb37627d57059938..3a4f023f6593b93d21bfa191156ee55f39f843dd 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -2208,21 +2208,22 @@ function get_my_courses($userid, $sort='visible DESC,sortorder ASC') {
             $course[$student->course] = $student->course;
         }
     }
-
-    if (count($course) > 0) {
-        if ($courses = get_records_list('course', 'id', implode(',', $course))) {
+    if (count($course) > 0 && empty($USER->admin)) {
+        if ($courses = get_records_list('course', 'id', implode(',', $course), '', 'id,visible')) {
             foreach ($courses as $k => $c) {
-                if (empty($USER->admin) && (!$c->visible || !course_parent_visible($c))) {
+                if (!$c->visible) {
                     unset($course[$c->id]);
                 }
             }
         }
     }
+
     if ($teachers = get_records('user_teachers', 'userid', $userid, '', 'id, course')) {
         foreach ($teachers as $teacher) {
             $course[$teacher->course] = $teacher->course;
         }
     }
+
     if (empty($course)) {
         return $course;
     }
@@ -2309,7 +2310,7 @@ function get_courses_search($searchterms, $sort='fullname ASC', $page=0, $record
 
     if ($courses) {  /// Remove unavailable courses from the list
         foreach ($courses as $key => $course) {
-            if (!$course->visible || !course_parent_visible($course)) {
+            if (!$course->visible) {
                 if (!isteacher($course->id)) {
                     unset($courses[$key]);
                     $totalcount--;
@@ -2340,7 +2341,7 @@ function get_categories($parent='none', $sort='sortorder ASC') {
     if ($categories) {  /// Remove unavailable categories from the list
         $creator = iscreator();
         foreach ($categories as $key => $category) {
-            if (!$category->visible || !category_parent_visible($category->parent)) {
+            if (!$category->visible) {
                 if (!$creator) {
                     unset($categories[$key]);
                 }