mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 16:32:43 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-47390-master-fixes' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2014-11-06 09:14:48 +00:00
commit e323635e1b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mod/forum/lib.php
View File

@ -1232,7 +1232,7 @@ function forum_make_mail_text($course, $cm, $forum, $discussion, $post, $userfro
// Always offer the unsubscribe from discussion link.
$posttext .= "\n---------------------------------------------------------------------\n";
$posttext .= get_string("unsubscribediscussion", "forum");
$posttext .= ": $CFG->wwwroot/mod/forum/subscribe.php?d=$discussion->id\n";
$posttext .= ": $CFG->wwwroot/mod/forum/subscribe.php?id=$forum->id&d=$discussion->id\n";
}
}
@ -1314,7 +1314,10 @@ function forum_make_mail_html($course, $cm, $forum, $discussion, $post, $userfro
$footerlinks[] = html_writer::link($unsublink, get_string('unsubscribe', 'mod_forum'));
}
// Always offer the unsubscribe from discussion link.
$unsublink = new moodle_url('/mod/forum/subscribe.php', array('d' => $discussion->id));
$unsublink = new moodle_url('/mod/forum/subscribe.php', array(
'id' => $forum->id,
'd' => $discussion->id,
));
$footerlinks[] = html_writer::link($unsublink, get_string('unsubscribediscussion', 'mod_forum'));
$footerlinks[] = '<a href="' . $CFG->wwwroot . '/mod/forum/unsubscribeall.php">' . get_string('unsubscribeall', 'forum') . '</a>';