From 653b8ef24b3b588db68dda12bd0ca49eb8b9445c Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Thu, 9 Jun 2016 16:45:31 +0800
Subject: [PATCH] MDL-54879 mod_lti: Add fallback options for error message
 upon failure

---
 mod/lti/externalregistrationreturn.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mod/lti/externalregistrationreturn.php b/mod/lti/externalregistrationreturn.php
index b6c8fc1a938..57fdcaa7106 100644
--- a/mod/lti/externalregistrationreturn.php
+++ b/mod/lti/externalregistrationreturn.php
@@ -45,6 +45,17 @@ $PAGE->set_pagelayout('maintenance');
 $output = $PAGE->get_renderer('mod_lti');
 echo $output->header();
 
+// Check status and lti_errormsg.
+if ($status !== 'success' && empty($err)) {
+    // We have a failed status and an empty lti_errormsg. Check if we can use lti_msg.
+    if (!empty($msg)) {
+        // The lti_msg attribute is set, use this as the error message.
+        $err = $msg;
+    } else {
+        // Otherwise, use our generic error message.
+        $err = get_string('failedtocreatetooltype', 'mod_lti');
+    }
+}
 $params = array('message' => s($msg), 'error' => s($err), 'id' => $id, 'status' => s($status));
 
 $page = new \mod_lti\output\external_registration_return_page();