Fixed navigation for forums where parents are chosen

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 72eb295ed1e1077e7c335016eb788a3cfbb13b24..4e0c94673eec729a53a68660624a797959dae530 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -97,12 +97,6 @@
 
     unset($SESSION->fromdiscussion);
 
-    $navlinks = array();
-    $navlinks[] = array('name' => get_string("forums", "forum"), 'link' => "../forum/index.php?id=$course->id", 'type' => 'activity');
-    $navlinks[] = array('name' => format_string($forum->name,true), 'link' => "../forum/view.php?f=$forum->id", 'type' => 'activityinstance');
-    $navlinks[] = array('name' => format_string($discussion->name,true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'title');
-    
-
     if ($mode) {
         set_user_preference('forum_displaymode', $mode);
     }
@@ -136,6 +130,14 @@
 
 
     $searchform = forum_search_form($course);
+
+    $navlinks = array();
+    $navlinks[] = array('name' => get_string('forums', 'forum'), 'link' => "../forum/index.php?id=$course->id", 'type' => 'activity');
+    $navlinks[] = array('name' => format_string($forum->name,true), 'link' => "../forum/view.php?f=$forum->id", 'type' => 'activityinstance');
+    $navlinks[] = array('name' => format_string($discussion->name,true), 'link' => "discuss.php?d=$discussion->id", 'type' => 'title');
+    if ($parent != $discussion->firstpost) {
+        $navlinks[] = array('name' => format_string($post->subject,true), 'type' => 'title');
+    }
     
     $navigation = build_navigation($navlinks); 
     print_header("$course->shortname: ".format_string($discussion->name), $course->fullname,