"MDL-6926, force language in forum module"

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 6c1f5169b3fe034baddb7afce9df0bf7d0dc1358..745bc6060840ab0586bcc65866ba56ca951fde45 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -4,7 +4,6 @@
 //  If no post is given, displays all posts in a discussion
 
     require_once('../../config.php');
-    require_once('lib.php');
 
     $d      = required_param('d', PARAM_INT);                // Discussion ID
     $parent = optional_param('parent', 0, PARAM_INT);        // If set, then display this post and all children.
@@ -31,6 +30,9 @@
 
     require_course_login($course, true, $cm);
 
+    // move this down fix for MDL-6926
+    require_once('lib.php');
+
     $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/forum:viewdiscussion', $modcontext, NULL, true, 'noviewdiscussionspermission', 'forum');
 

diff --git a/mod/forum/post.php b/mod/forum/post.php
index e451b888626cba86a113cb7e2f46720e9b76b18a..ca1e45d2ac3dca92df595b46ee28a7aedd11f798 100644 (file)
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -4,7 +4,6 @@
 
     require_once('../../config.php');
     require_once('lib.php');
-    require_once('post_form.php');
 
     $reply   = optional_param('reply', 0, PARAM_INT);
     $forum   = optional_param('forum', 0, PARAM_INT);
@@ -135,6 +134,9 @@
             print_error('invalidcoursemodule');
         }
 
+        // call course_setup to use forced language, MDL-6926 
+        course_setup($course->id);
+
         $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
         $modcontext    = get_context_instance(CONTEXT_MODULE, $cm->id);
 
@@ -450,6 +452,11 @@
         $forum->maxattachments = 3;
     }
 
+    // setup course variable to force form language
+    // fix for MDL-6926
+    course_setup($course->id);
+    require_once('post_form.php');
+
     $mform_post = new mod_forum_post_form('post.php', array('course'=>$course, 'cm'=>$cm, 'coursecontext'=>$coursecontext, 'modcontext'=>$modcontext, 'forum'=>$forum, 'post'=>$post));
 
     file_prepare_draftarea($draftitemid, $modcontext->id, 'forum_attachment', empty($post->id)?null:$post->id , false);

diff --git a/mod/forum/view.php b/mod/forum/view.php
index 94e9cca6e878ae07059a32d9a0112a59b1d55067..53c03506a805210728ff29a929b73f9d66c7ab1c 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -26,6 +26,9 @@
         if (! $forum = $DB->get_record("forum", array("id" => $cm->instance))) {
             print_error('invalidforumid', 'forum');
         }
+        // move require_course_login here to use forced language for course
+        // fix for MDL-6926
+        require_course_login($course, true, $cm);
         $strforums = get_string("modulenameplural", "forum");
         $strforum = get_string("modulename", "forum");
         $buttontext = update_module_button($cm->id, $course->id, $strforum);
@@ -39,13 +42,14 @@
             print_error('coursemisconf');
         }
 
-        $strforums = get_string("modulenameplural", "forum");
-        $strforum = get_string("modulename", "forum");
-
         if (!$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
             print_error('missingparameter');
         }
-
+        // move require_course_login here to use forced language for course
+        // fix for MDL-6926
+        require_course_login($course, true, $cm);
+        $strforums = get_string("modulenameplural", "forum");
+        $strforum = get_string("modulename", "forum");
         $buttontext = update_module_button($cm->id, $course->id, $strforum);
 
     } else {
@@ -56,8 +60,6 @@
         $buttontext = forum_search_form($course, $search);
     }
 
-
-    require_course_login($course, true, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);