Merge branch 'mdl58817-moodle33' of https://github.com/tlock/moodle into MOODLE_33_STABLE

2017-11-22 13:27:29 +01:00
parent 8854864605 d1c7b42f57
commit 5ef58abac3
1 changed files with 9 additions and 0 deletions
@@ -3020,6 +3020,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;
    }