Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Jan 2013 06:59:22 +0000 (14:59 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Jan 2013 06:59:22 +0000 (14:59 +0800)
1  2 
mod/forum/lib.php

diff --combined mod/forum/lib.php
@@@ -715,6 -715,11 +715,11 @@@ function forum_cron() 
                  $eventdata->contexturl = "{$CFG->wwwroot}/mod/forum/discuss.php?d={$discussion->id}#p{$post->id}";
                  $eventdata->contexturlname = $discussion->name;
  
+                 // If forum_replytouser is not set then send mail using the noreplyaddress.
+                 if (empty($CFG->forum_replytouser)) {
+                     $eventdata->userfrom->email = $CFG->noreplyaddress;
+                 }
                  $mailresult = message_send($eventdata);
                  if (!$mailresult){
                      mtrace("Error: mod/forum/lib.php forum_cron(): Could not send out mail for id $post->id to user $userto->id".
                  }
  
                  $attachment = $attachname='';
-                 $usetrueaddress = true;
                  // Directly email forum digests rather than sending them via messaging, use the
                  // site shortname as 'from name', the noreply address will be used by email_to_user.
-                 $mailresult = email_to_user($userto, $site->shortname, $postsubject, $posttext, $posthtml, $attachment, $attachname, $usetrueaddress, $CFG->forum_replytouser);
+                 $mailresult = email_to_user($userto, $site->shortname, $postsubject, $posttext, $posthtml, $attachment, $attachname);
  
                  if (!$mailresult) {
                      mtrace("ERROR!");
@@@ -5679,7 -5683,7 +5683,7 @@@ function forum_print_latest_discussions
                      $link = true;
                  } else {
                      $modcontext = context_module::instance($cm->id);
 -                    $link = forum_user_can_post($forum, $discussion, $USER, $cm, $course, $modcontext);
 +                    $link = forum_user_can_see_discussion($forum, $discussion, $modcontext, $USER);
                  }
  
                  $discussion->forum = $forum->id;
@@@ -7192,7 -7196,7 +7196,7 @@@ function forum_reset_userdata($data) 
      if( $removeposts || !empty($data->reset_forum_ratings) ) {
          $forumssql      = "$allforumssql $typesql";
          $forums = $forums = $DB->get_records_sql($forumssql, $params);
 -        $rm = new rating_manager();;
 +        $rm = new rating_manager();
          $ratingdeloptions = new stdClass;
          $ratingdeloptions->component = 'mod_forum';
          $ratingdeloptions->ratingarea = 'post';