MDL-58817 mod_lti: cartridge: maintain custom icons

2017-11-13 10:18:02 +10:30
parent 665c3ac59c
commit d26cdca687
1 changed files with 9 additions and 0 deletions
@@ -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;
    }