From d26cdca687acc52e0830f94f4e6c775cf364c16e Mon Sep 17 00:00:00 2001
From: Tim Lock <tim@netspot.com.au>
Date: Mon, 13 Nov 2017 07:50:46 +1030
Subject: [PATCH] MDL-58817 mod_lti: cartridge: maintain custom icons

---
 mod/lti/locallib.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mod/lti/locallib.php b/mod/lti/locallib.php
index 89ee9991c6c..5ebe24c52a5 100644
--- a/mod/lti/locallib.php
+++ b/mod/lti/locallib.php
@@ -3037,6 +3037,15 @@ function lti_load_type_from_cartridge($url, $type) {
     }
     unset($toolinfo['lti_extension_secureicon']);
 
+    // Ensure Custom icons aren't overridden by cartridge params.
+    if (!empty($type->lti_icon)) {
+        unset($toolinfo['lti_icon']);
+    }
+
+    if (!empty($type->lti_secureicon)) {
+        unset($toolinfo['lti_secureicon']);
+    }
+
     foreach ($toolinfo as $property => $value) {
         $type->$property = $value;
     }