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

MDL-13542 Merged return checking from stable 1.9

Browse Source
This commit is contained in:
moodler
2008-02-20 06:16:07 +00:00
parent 10ed581c9a
commit 150be0dfd0
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/index.php
+18 -5
View File
@@ -92,8 +92,13 @@
foreach ($forums as $forum) {
$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) {
continue; // Shouldn't happen
}
if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) {
continue; // Shouldn't happen
}
if (!has_capability('mod/forum:viewdiscussion', $context)) {
if (isset($forum->keyreference)) {
@@ -158,8 +163,12 @@
if ($generalforums) {
foreach ($generalforums as $forum) {
$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
if (!$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
continue; // Shouldn't happen
}
if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) {
continue; // Shouldn't happen
}
if (!groups_course_module_visible($cm)) {
continue;
@@ -294,7 +303,11 @@
if ($learningforums) {
$currentsection = "";
foreach ($learningforums as $key => $forum) {
$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id);
if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) {
continue; // Shouldn't happen
}
if (!coursemodule_visible_for_user($cm)) {
continue;
}