From eb712e4280d61bd80081c7851ea6bccdb4230b60 Mon Sep 17 00:00:00 2001 From: Eloy Lafuente Date: Thu, 21 Jan 2010 23:43:11 +0000 Subject: [PATCH] MDL-21265 wiki - fix problem for students not able to see entries in other groups until own entry is created by teacher. Merged from 19_STABLE --- mod/wiki/lib.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php index 6e4bf7aca0f..e9760fb4fd0 100644 --- a/mod/wiki/lib.php +++ b/mod/wiki/lib.php @@ -1251,11 +1251,13 @@ function wiki_can_add_entry(&$wiki, &$user, &$course, $userid=0, $groupid=0) { else if ($groupid == 0) { return ($mygroupid != 0 and wiki_is_teacher($wiki)); } - /// If there is a group mode, non-editing teachers with an assigned group, can only create wikis - /// in their group. Non-editing teachers with no assigned group and editing teachers can create any wiki. + /// If requesting a group, must be an editing teacher, a non-editing teacher with no assigned group, + /// or a non-editing teacher requesting their group. or a student in group, but wiki is empty. else { return (wiki_is_teacheredit($wiki) or - (wiki_is_teacher($wiki) and ($mygroupid == 0 or @in_array($groupid, $mygroupid)))); + (wiki_is_teacher($wiki) and ($mygroupid == 0 or @in_array($groupid, $mygroupid))) or + (wiki_is_student($wiki, $user->id) and @in_array($groupid, $mygroupid)) + ); } break; }