Merge branch 'MDL-36580_33' of https://github.com/stronk7/moodle into…

… MOODLE_33_STABLE
moodle · Oct 25, 2017 · 82938bb · 82938bb
2 parents 92126f2 + e81b7b7
commit 82938bb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mod/lti/backup/moodle2/restore_lti_stepslib.php b/mod/lti/backup/moodle2/restore_lti_stepslib.php
@@ -86,8 +86,8 @@ protected function process_lti($data) {
 
         // Try to decrypt resourcekey and password. Null if not possible (DB default).
         // Note these fields were originally encrypted on backup using {link @encrypted_final_element}.
-        $data->resourcekey = $this->decrypt($data->resourcekey);
-        $data->password = $this->decrypt($data->password);
+        $data->resourcekey = isset($data->resourcekey) ? $this->decrypt($data->resourcekey) : null;
+        $data->password = isset($data->password) ? $this->decrypt($data->password) : null;
 
         $newitemid = $DB->insert_record('lti', $data);