Merge branch 'MDL-24860_messaging_providers' of git://github.com/andyjdavis/moodle

Conflicts:
	mod/lesson/version.php
This commit is contained in:
Petr Skoda 2010-12-27 13:39:20 +01:00
commit 1310964bb3
10 changed files with 51 additions and 2 deletions

View file

@ -920,6 +920,7 @@ function forum_cron() {
$attachment = $attachname='';
$usetrueaddress = true;
//directly email forum digests rather than sending them via messaging
$mailresult = email_to_user($userto, $site->shortname, $postsubject, $posttext, $posthtml, $attachment, $attachname, $usetrueaddress, $CFG->forum_replytouser);
if (!$mailresult) {