MDL-19147 - forum - Removed single discussions from the pull down menu for moving posts to single discussions.

This commit is contained in:
2011-12-02 08:11:16 +08:00
parent 6dc36a0101
commit 24b048c2cf
+9 -1
View File
@@ -61,6 +61,10 @@
if (!$forumto = get_record('forum', 'id', $move)) {
error('You can\'t move to that forum - it doesn\'t exist!', $return);
}
if ($forumto->type == 'single') {
error('Cannot move discussion to a simple single discussion forum.', $return);
}
if (!$cmto = get_coursemodule_from_instance('forum', $forumto->id, $course->id)) {
error('Target forum not found in this course.', $return);
@@ -187,6 +191,8 @@
}
$section = -1;
$forummenu = array();
// Check forum types and eliminate simple discussions.
$forumcheck = get_records('forum', 'course', $course->id, '', 'id, type');
foreach ($modinfo->instances['forum'] as $forumcm) {
if (!$forumcm->uservisible || !has_capability('mod/forum:startdiscussion',
get_context_instance(CONTEXT_MODULE,$forumcm->id))) {
@@ -197,7 +203,9 @@
$forummenu[] = "-------------- $strsection $forumcm->sectionnum --------------";
}
$section = $forumcm->sectionnum;
if ($forumcm->instance != $forum->id) {
$forumidcompare = $forumcm->instance != $forum->id;
$forumtypecheck = $forumcheck[$forumcm->instance]->type !== 'single';
if ($forumidcompare and $forumtypecheck) {
$url = "discuss.php?d=$discussion->id&move=$forumcm->instance&sesskey=".sesskey();
$forummenu[$url] = format_string($forumcm->name);
}