Merge branch 'MDL-53832-master-review-fixes' of https://github.com/ju…

…npataleta/moodle
andelacruz · Oct 20, 2016 · ed971b9 · ed971b9
2 parents 2d13900 + b75d0f0
commit ed971b9
Show file tree

Hide file tree

Showing 71 changed files with 14,797 additions and 270 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -56,6 +56,7 @@ lib/spout/
 lib/amd/src/chartjs-lazy.js
 lib/maxmind/GeoIp2/
 lib/maxmind/MaxMind/
+lib/ltiprovider/
 mod/assign/feedback/editpdf/fpdi/
 repository/s3/S3.php
 theme/boost/scss/bootstrap/

diff --git a/.stylelintignore b/.stylelintignore
@@ -57,6 +57,7 @@ lib/spout/
 lib/amd/src/chartjs-lazy.js
 lib/maxmind/GeoIp2/
 lib/maxmind/MaxMind/
+lib/ltiprovider/
 mod/assign/feedback/editpdf/fpdi/
 repository/s3/S3.php
 theme/boost/scss/bootstrap/

diff --git a/enrol/lti/cartridge.php b/enrol/lti/cartridge.php
@@ -40,7 +40,7 @@
 // Only show the cartridge if the token parameter is correct.
 // If we do not compare with a shared secret, someone could very easily
 // guess an id for the enrolment.
-if (!\enrol_lti\helper::verify_tool_token($toolid, $token)) {
+if (!\enrol_lti\helper::verify_cartridge_token($toolid, $token)) {
     throw new \moodle_exception('incorrecttoken', 'enrol_lti');
 }