forum MDL-19808 Fixed minor regressions caused by upgrades

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 523b03c72783bdbd64e14962d4c5526455d037a8..ed1a9adf35aa03f121aa575d838db3dce8113b90 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -12,13 +12,23 @@
     $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
-            ));
+    $url = new moodle_url($CFG->wwwroot.'/mod/forum/discuss.php', array('d'=>$d));
+    if ($parent !== 0) {
+        $url->param('parent', $parent);
+    }
+    if ($mode !== 0) {
+        $url->param('mode', $mode);
+    }
+    if ($move !== 0) {
+        $url->param('move', $move);
+    }
+    if ($mark !== '') {
+        $url->param('mark', $mark);
+    }
+    if ($postid !== 0) {
+        $url->param('postid', $postid);
+    }
+    $PAGE->set_url($url);
 
     if (!$discussion = $DB->get_record('forum_discussions', array('id' => $d))) {
         print_error('invaliddiscussionid', 'forum');
@@ -35,7 +45,6 @@
     if (!$cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) {
         print_error('invalidcoursemodule');
     }
-
     require_course_login($course, true, $cm);
 
 /// Add ajax-related libs
@@ -149,7 +158,7 @@
 
     $searchform = forum_search_form($course);
 
-    $PAGE->navbar->add(format_string($discussion->name), new moodle_url($CFG->wwwroot.'/mod/forum/discuss.php', array('id'=>$discussion->id)));
+    $PAGE->navbar->add(format_string($discussion->name), new moodle_url($CFG->wwwroot.'/mod/forum/discuss.php', array('d'=>$discussion->id)));
     if ($parent != $discussion->firstpost) {
         $PAGE->navbar->add(format_string($post->subject));
     }

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index ab8eb069d0f6598e2c06e92fc1f58800653af095..5daec0e17e0f4b5b5d27e3909be35ac5e52b5bf7 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -8395,7 +8395,9 @@ function forum_extend_settings_navigation($settingsnav, $module=null) {
     $forum->forceopen = true;
 
     $forumobject = $DB->get_record("forum", array("id" => $PAGE->cm->instance));
-
+    if (empty($PAGE->cm->context)) {
+        $PAGE->cm->context = get_context_instance(CONTEXT_MODULE, $PAGE->cm->instance);
+    }
     if (!empty($USER->id) && !has_capability('moodle/legacy:guest', $PAGE->cm->context, NULL, false)) {
         $notekey = false;
         $helpbutton = false;