MDL-13542 Merged return checking from stable 1.9

diff --git a/mod/forum/index.php b/mod/forum/index.php
index 59ecbb250608dd57a339df6d5d575d9b032fb9ad..5e0b941c507244377fffc2108fb833f7e9d52ed1 100644 (file)
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -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;
                 }