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

Merged fixes from stable for MDL-8741

Browse Source
This commit is contained in:
moodler
2007-03-05 02:15:32 +00:00
parent 5d251e995a
commit 511ec76be0
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
group/lib/legacylib.php
+5 -4
View File
@@ -151,12 +151,13 @@ function mygroupid($courseid) {
}
/**
* This now returns either false or SEPARATEGROUPS. If you want VISIBLE GROUPS
* with legacy code, you'll need to upgrade.
* Returns the current group mode for a given course or activity module
*
* Could be false, SEPARATEGROUPS or VISIBLEGROUPS (<-- Martin)
*/
function groupmode($course, $cm=null) {
if (is_object($cm) && isset($cm->groupmode) && !isset($course->groupmodeforce)) {
if (isset($cm->groupmode) && empty($course->groupmodeforce)) {
return $cm->groupmode;
}
return $course->groupmode;
@@ -407,4 +408,4 @@ function groups_get_groups_users($userids, $courseid) {
return $groups_users;
}
?>
?>
mod/forum/discuss.php
+1 -1
View File
@@ -169,7 +169,7 @@
$groupmode = groupmode($course, $cm);
if ($groupmode && $course->groupmodeforce && !has_capability('moodle/site:accessallgroups', $modcontext)) {
if ($groupmode && !has_capability('moodle/site:accessallgroups', $modcontext)) {
// Groups must be kept separate
//change this to ismember
$mygroupid = mygroupid($course->id); //only useful if 0, otherwise it's an array now
mod/forum/index.php
+1 -1
View File
@@ -164,7 +164,7 @@
$cm = get_coursemodule_from_instance("forum", $forum->id, $course->id);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
if (isset($forum->groupmode)) {
if (isset($forum->groupmode)) {
$groupmode = groupmode($course, $forum); /// Can do this because forum->groupmode is defined
} else {
$groupmode = NOGROUPS;
mod/forum/search.php
+3 -2
View File
@@ -399,15 +399,16 @@ function forum_menu_list($course) {
foreach ($forums as $forum) {
if ($cm = get_coursemodule_from_instance('forum', $forum->id, $course->id)) {
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
if (!isset($forum->visible)) {
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
if (!instance_is_visible("forum", $forum) &&
!has_capability('moodle/course:viewhiddenactivities', $context)) {
continue;
}
}
$groupmode = groupmode($course, $cm); // Groups are being used
if (($groupmode == SEPARATEGROUPS) and ($currentgroup === false)) {
if ($groupmode == SEPARATEGROUPS && ($currentgroup === false) &&
!has_capability('moodle/site:accessallgroups', $context)) {
continue;
}
}
mod/forum/view.php
+1 -1
View File
@@ -82,7 +82,7 @@
$groupmode = groupmode($course, $cm);
$currentgroup = get_and_set_current_group($course, $groupmode, $changegroup);
if ($groupmode and ($currentgroup === false) and
if ($groupmode == SEPARATEGROUPS && ($currentgroup === false) &&
!has_capability('moodle/site:accessallgroups', $context)) {
notice(get_string('notingroup', 'forum'));
}