Fix the display when USER display mode is flat, and a parent is selec…

…ted. In this case, the display is temporarily changed to nested
moodle · Sep 2, 2002 · e92ea3d · e92ea3d
1 parent 5a83a0a
commit e92ea3d
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
@@ -33,11 +33,13 @@
 
     forum_set_display_mode($mode);
 
-    if (abs($USER->mode) == 1) {  // If flat display then display the lot.
+    $displaymode = $USER->mode;
-        $parent = 0;  
-    }
 
-    if (!$parent) {
+    if ($parent) {
+        if (abs($USER->mode) == 1) {  // If flat AND parent, then force nested display this time
+            $displaymode = 3;
+        }
+    } else {
         $parent = $discussion->firstpost;
         $navtail = "$discussion->name";
     }
@@ -67,7 +69,7 @@
                  "$navmiddle -> $navtail", "", "", true, $updatebutton);
     }
 
-    forum_print_discussion($course, $forum, $discussion, $post, $USER->mode);
+    forum_print_discussion($course, $forum, $discussion, $post, $displaymode);
 
     print_footer($course);