MDL-19808 Added set_url and fixed minor bugs

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index b754816370bc811c9923903347e1a16d7f62a14b..46282b24462b3116b2afc9aab132fbd4e9c2ba73 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -12,6 +12,14 @@
     $mark   = optional_param('mark', '', PARAM_ALPHA);       // Used for tracking read posts if user initiated.
     $postid = optional_param('postid', 0, PARAM_INT);        // Used for tracking read posts if user initiated.
 
+    $PAGE->set_url('/mod/forum/post.php', array(
+            'd' => $d,
+            'parent' => $parent,
+            'mode'  => $mode,
+            'mark' => $mark,
+            'postid'  => $postid
+            ));
+
     if (!$discussion = $DB->get_record('forum_discussions', array('id' => $d))) {
         print_error('invaliddiscussionid', 'forum');
     }

diff --git a/mod/forum/post.php b/mod/forum/post.php
index da4499ca92e3a22d47718c6ba71bd67950ea4c39..af9e9f7c4862dd360844647f72641fdd4b84d9a3 100644 (file)
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -14,6 +14,16 @@
     $confirm = optional_param('confirm', 0, PARAM_INT);
     $groupid = optional_param('groupid', null, PARAM_INT);
 
+    $PAGE->set_url('/mod/forum/post.php', array(
+            'reply' => $reply,
+            'forum' => $forum,
+            'edit'  => $edit,
+            'delete'=> $delete,
+            'prune' => $prune,
+            'name'  => $name,
+            'confirm'=>$confirm,
+            'groupid'=>$groupid,
+            ));
     //these page_params will be passed as hidden variables later in the form.
     $page_params = array('reply'=>$reply, 'forum'=>$forum, 'edit'=>$edit);
 
@@ -52,7 +62,7 @@
 
         $PAGE->set_title($course->shortname);
         $PAGE->set_heading($course->fullname);
-        
+
         echo $OUTPUT->header();
         echo $OUTPUT->confirm(get_string('noguestpost', 'forum').'<br /><br />'.get_string('liketologin'), get_login_url(), get_referer(false));
         echo $OUTPUT->footer();
@@ -748,8 +758,10 @@
 
     $forcefocus = empty($reply) ? NULL : 'message';
 
+    if (!empty($discussion->id)) {
+        $PAGE->navbar->add(format_string($toppost->subject, true), "discuss.php?d=$discussion->id");
+    }
 
-    $PAGE->navbar->add(format_string($toppost->subject, true), "discuss.php?d=$discussion->id");
     if ($post->parent) {
         $PAGE->navbar->add(get_string('editing', 'forum'));
     }