Merge branch 'mdl58817-master' of https://github.com/tlock/moodle

2017-11-22 13:24:30 +01:00
parent 6472ad5600 a33be61af8
commit 4b560e4a8e
1 changed files with 9 additions and 0 deletions
@@ -3042,6 +3042,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;
    }