L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"MDL-6926, force language in forum module"

Browse Source
This commit is contained in:
dongsheng
2009-01-14 04:55:10 +00:00
parent 7bbe53f402
commit dfa8aab5d8
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/discuss.php
+3 -1
View File
@@ -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');
mod/forum/post.php
+8 -1
View File
@@ -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);
@@ -139,6 +138,9 @@
error("Incorrect cm");
}
// 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);
@@ -440,6 +442,11 @@
}
$modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
// 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));
if ($fromform = $mform_post->get_data()) {
mod/forum/view.php
+9 -6
View File
@@ -26,6 +26,9 @@
if (! $forum = get_record("forum", "id", $cm->instance)) {
error("Forum ID was incorrect");
}
// 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,16 @@
error("Forum is misconfigured - don't know what course it's from");
}
$strforums = get_string("modulenameplural", "forum");
$strforum = get_string("modulename", "forum");
if (!$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) {
error("Course Module missing");
}
// 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,11 +62,8 @@
$buttontext = forum_search_form($course, $search);
}
require_course_login($course, true, $cm);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
/// Print header.
$navigation = build_navigation('', $cm);
print_header_simple(format_string($forum->name), "",