mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-32253-master' of git://github.com/danpoltawski/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2013-06-18 11:26:23 +12:00
commit 407020ef8c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/forum/lib.php
View File

@ -937,6 +937,8 @@ function forum_cron() {
$posttext .= " -> ".format_string($discussion->name,true);
}
$posttext .= "\n";
$posttext .= $CFG->wwwroot.'/mod/forum/discuss.php?d='.$discussion->id;
$posttext .= "\n";
$posthtml .= "<p><font face=\"sans-serif\">".
"<a target=\"_blank\" href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$shortname</a> -> ".
@ -990,7 +992,9 @@ function forum_cron() {
$userfrom->customheaders = array ("Precedence: Bulk");
if ($userto->maildigest == 2) {
// Subjects only
// Subjects and link only
$posttext .= "\n";
$posttext .= $CFG->wwwroot.'/mod/forum/discuss.php?d='.$discussion->id;
$by = new stdClass();
$by->name = fullname($userfrom);
$by->date = userdate($post->modified);
@ -1125,6 +1129,8 @@ function forum_make_mail_text($course, $cm, $forum, $discussion, $post, $userfro
// add absolute file links
$post->message = file_rewrite_pluginfile_urls($post->message, 'pluginfile.php', $modcontext->id, 'mod_forum', 'post', $post->id);
$posttext .= "\n";
$posttext .= $CFG->wwwroot.'/mod/forum/discuss.php?d='.$discussion->id;
$posttext .= "\n---------------------------------------------------------------------\n";
$posttext .= format_string($post->subject,true);
if ($bare) {