From 26e831128755aa4ce266caafc47c55d652e893b5 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Wed, 27 Apr 2016 10:26:43 +0800
Subject: [PATCH] MDL-52035 enrol_lti: Fixed default mail display setting

---
 enrol/lti/classes/helper.php | 8 +++++++-
 enrol/lti/settings.php       | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/enrol/lti/classes/helper.php b/enrol/lti/classes/helper.php
index ba554d60f65..7c80ea9affb 100644
--- a/enrol/lti/classes/helper.php
+++ b/enrol/lti/classes/helper.php
@@ -110,7 +110,13 @@ class helper {
         $user->country = (!empty($tool->country)) ? $tool->country : "";
         $user->institution = (!empty($tool->institution)) ? $tool->institution : "";
         $user->timezone = (!empty($tool->timezone)) ? $tool->timezone : "";
-        $user->maildisplay = (!empty($tool->maildisplay)) ? $tool->maildisplay : $CFG->defaultpreference_maildisplay;
+        if (isset($tool->maildisplay)) {
+            $user->maildisplay = $tool->maildisplay;
+        } else if (isset($CFG->defaultpreference_maildisplay)) {
+            $user->maildisplay = $CFG->defaultpreference_maildisplay;
+        } else {
+            $user->maildisplay = 2;
+        }
         $user->mnethostid = $CFG->mnet_localhost_id;
         $user->confirmed = 1;
         $user->lang = $tool->lang;
diff --git a/enrol/lti/settings.php b/enrol/lti/settings.php
index 7dc6db617ea..6c92669c6bd 100644
--- a/enrol/lti/settings.php
+++ b/enrol/lti/settings.php
@@ -32,8 +32,9 @@ if ($ADMIN->fulltree) {
     $choices = array(0 => get_string('emaildisplayno'),
                      1 => get_string('emaildisplayyes'),
                      2 => get_string('emaildisplaycourse'));
+    $maildisplay = isset($CFG->defaultpreference_maildisplay) ? $CFG->defaultpreference_maildisplay : 2;
     $settings->add(new admin_setting_configselect('enrol_lti/emaildisplay', get_string('emaildisplay'), '',
-        $CFG->defaultpreference_maildisplay, $choices));
+        $maildisplay, $choices));
 
     $city = '';
     if (!empty($CFG->defaultcity)) {