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

Merge branch 'MDL-47930-27' of git://github.com/andrewnicols/moodle into MOODLE_27_STABLE

Browse Source
This commit is contained in:
Damyon Wiese
2014-11-05 14:21:28 +08:00
parent 24422c9028 2fe3a171c4
commit 9aefa9c8d3
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/index.php
+6 -14
View File
@@ -266,13 +266,9 @@ if ($generalforums) {
}
if ($can_subscribe) {
if ($forum->forcesubscribe != FORUM_DISALLOWSUBSCRIBE) {
$row[] = forum_get_subscribe_link($forum, $context, array('subscribed' => $stryes,
'unsubscribed' => $strno, 'forcesubscribed' => $stryes,
'cantsubscribe' => '-'), false, false, true, $subscribed_forums);
} else {
$row[] = '-';
}
$row[] = forum_get_subscribe_link($forum, $context, array('subscribed' => $stryes,
'unsubscribed' => $strno, 'forcesubscribed' => $stryes,
'cantsubscribe' => '-'), false, false, true);
$digestoptions_selector->url->param('id', $forum->id);
if ($forum->maildigest === null) {
@@ -416,13 +412,9 @@ if ($course->id != SITEID) { // Only real courses have learning forums
}
if ($can_subscribe) {
if ($forum->forcesubscribe != FORUM_DISALLOWSUBSCRIBE) {
$row[] = forum_get_subscribe_link($forum, $context, array('subscribed' => $stryes,
'unsubscribed' => $strno, 'forcesubscribed' => $stryes,
'cantsubscribe' => '-'), false, false, true, $subscribed_forums);
} else {
$row[] = '-';
}
$row[] = forum_get_subscribe_link($forum, $context, array('subscribed' => $stryes,
'unsubscribed' => $strno, 'forcesubscribed' => $stryes,
'cantsubscribe' => '-'), false, false, true, $subscribed_forums);
$digestoptions_selector->url->param('id', $forum->id);
if ($forum->maildigest === null) {