From 2321c81d528f7923da8834d8a5da2be9346e5905 Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Thu, 6 Apr 2017 15:27:25 +0800
Subject: [PATCH] MDL-55950 mod_feedback: correct link to response in the email

---
 mod/feedback/classes/completion.php |  2 +-
 mod/feedback/lib.php                | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mod/feedback/classes/completion.php b/mod/feedback/classes/completion.php
index 3477629d047..b8830efdd69 100644
--- a/mod/feedback/classes/completion.php
+++ b/mod/feedback/classes/completion.php
@@ -483,7 +483,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());
         }
diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index b445937701d..e203efea133 100644
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -2927,9 +2927,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
@@ -2978,6 +2979,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);