MDL-11304 remerging fixes

This commit is contained in:
skodak
2007-10-07 13:31:41 +00:00
parent 4924f1d280
commit 8ce8fc85fc
+13 -12
View File
@@ -141,8 +141,12 @@
if (! $course = get_record("course", "id", $discussion->course)) {
error("The course number was incorrect ($discussion->course)");
}
if (! $cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
error("Incorrect cm");
}
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
$modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
if (! forum_user_can_post($forum)) {
if (has_capability('moodle/legacy:guest', $coursecontext, NULL, false)) { // User is a guest here!
@@ -154,20 +158,17 @@
}
}
if ($cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
if (groupmode($course, $cm)) { // Make sure user can post here
$modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
$mygroupid = mygroupid($course->id);
if (!((empty($mygroupid) and $discussion->groupid == -1)
|| (groups_is_member($discussion->groupid)/*$mygroupid == $discussion->groupid*/)
|| has_capability('moodle/site:accessallgroups', $modcontext, NULL, false) )) {
print_error('nopostdiscussion', 'forum');
}
}
if (!$cm->visible and !has_capability('moodle/course:manageactivities', $coursecontext)) {
error(get_string("activityiscurrentlyhidden"));
if (groupmode($course, $cm)) { // Make sure user can post here
$mygroupid = mygroupid($course->id);
if (!((empty($mygroupid) and $discussion->groupid == -1)
|| (groups_is_member($discussion->groupid)/*$mygroupid == $discussion->groupid*/)
|| has_capability('moodle/site:accessallgroups', $modcontext, NULL, false) )) {
print_error('nopostdiscussion', 'forum');
}
}
if (!$cm->visible and !has_capability('moodle/course:manageactivities', $coursecontext)) {
error(get_string("activityiscurrentlyhidden"));
}
// Load up the $post variable.