moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-35514_master' of https://github.com/markn86/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2014-06-02 18:19:52 +02:00
commit 4df54b06f1
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mod/forum/lib.php
View file

@ -5640,15 +5640,17 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=-1, $di
echo '</form>';
echo "</div>\n";
} else if (isguestuser() or !isloggedin() or $forum->type == 'news') {
} else if (isguestuser() or !isloggedin() or $forum->type == 'news' or
$forum->type == 'qanda' and !has_capability('mod/forum:addquestion', $context) or
$forum->type != 'qanda' and !has_capability('mod/forum:startdiscussion', $context)) {
// no button and no info
} else if ($groupmode and has_capability('mod/forum:startdiscussion', $context)) {
} else if ($groupmode and !has_capability('moodle/site:accessallgroups', $context)) {
// inform users why they can not post new discussion
if ($currentgroup) {
echo $OUTPUT->notification(get_string('cannotadddiscussion', 'forum'));
} else {
if (!$currentgroup) {
echo $OUTPUT->notification(get_string('cannotadddiscussionall', 'forum'));
} else if (!groups_is_member($currentgroup)) {
echo $OUTPUT->notification(get_string('cannotadddiscussion', 'forum'));
}
}