mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +02:00
FIxed a problem with teacher forums (couldn't read any discussions!)
This commit is contained in:
parent
70bcf579a6
commit
68258534a5
1 changed files with 16 additions and 14 deletions
|
@ -21,11 +21,24 @@
|
||||||
error("Course ID is incorrect - discussion is faulty");
|
error("Course ID is incorrect - discussion is faulty");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $cm = get_coursemodule_from_instance("forum", $discussion->forum, $course->id)) {
|
if (! $forum = get_record("forum", "id", $discussion->forum)) {
|
||||||
error("Course Module ID was incorrect");
|
notify("Bad forum ID stored in this discussion");
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($forum->type == "teacher") {
|
||||||
|
require_login($course->id);
|
||||||
|
|
||||||
|
if (!isteacher($course->id)) {
|
||||||
|
error("You must be a $course->teacher to view this forum");
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
if (! $cm = get_coursemodule_from_instance("forum", $discussion->forum, $course->id)) {
|
||||||
|
error("Course Module ID was incorrect");
|
||||||
|
}
|
||||||
|
require_course_login($course, false, $cm);
|
||||||
}
|
}
|
||||||
|
|
||||||
require_course_login($course, false, $cm);
|
|
||||||
|
|
||||||
if (!empty($move)) {
|
if (!empty($move)) {
|
||||||
if (!isteacher($course->id)) {
|
if (!isteacher($course->id)) {
|
||||||
|
@ -49,17 +62,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($forum)) {
|
|
||||||
if (! $forum = get_record("forum", "id", $discussion->forum)) {
|
|
||||||
notify("Bad forum ID stored in this discussion");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($forum->type == "teacher") {
|
|
||||||
if (!isteacher($course->id)) {
|
|
||||||
error("You must be a $course->teacher to view this forum");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$logparameters = "d=$discussion->id";
|
$logparameters = "d=$discussion->id";
|
||||||
if ($parent) {
|
if ($parent) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue