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

Merge branch 'wip-MDL-55950-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE

Browse Source
This commit is contained in:
David Monllao
2017-04-10 16:12:18 +02:00
parent 87562dbe24 2321c81d52
commit 201812e592
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/classes/completion.php
+1 -1
View File
@@ -498,7 +498,7 @@ class mod_feedback_completion extends mod_feedback_structure {
// Send email.
if ($this->feedback->anonymous == FEEDBACK_ANONYMOUS_NO) {
feedback_send_email($this->cm, $this->feedback, $this->cm->get_course(), $USER);
feedback_send_email($this->cm, $this->feedback, $this->cm->get_course(), $USER, $this->completed);
} else {
feedback_send_email_anonym($this->cm, $this->feedback, $this->cm->get_course());
}
mod/feedback/lib.php
+9 -1
View File
@@ -2925,9 +2925,10 @@ function feedback_print_numeric_option_list($startval, $endval, $selectval = '',
* @param object $feedback
* @param object $course
* @param stdClass|int $user
* @param stdClass $completed record from feedback_completed if known
* @return void
*/
function feedback_send_email($cm, $feedback, $course, $user) {
function feedback_send_email($cm, $feedback, $course, $user, $completed = null) {
global $CFG, $DB;
if ($feedback->email_notification == 0) { // No need to do anything
@@ -2976,6 +2977,13 @@ function feedback_send_email($cm, $feedback, $course, $user) {
$info->url = $CFG->wwwroot.'/mod/feedback/show_entries.php?'.
'id='.$cm->id.'&'.
'userid=' . $user->id;
if ($completed) {
$info->url .= '&showcompleted=' . $completed->id;
if ($feedback->course == SITEID) {
// Course where feedback was completed (for site feedbacks only).
$info->url .= '&courseid=' . $completed->courseid;
}
}
$a = array('username' => $info->username, 'feedbackname' => $feedback->name);