L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged fixes from stable (undoing category visibility changes)

Browse Source
This commit is contained in:
moodler
2006-05-02 07:56:25 +00:00
parent df4ba5a1b9
commit 152a90601b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/datalib.php
+7 -6
View File
@@ -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]);
}