Skip to content

Commit 1d6dd43

Browse files
author
David Monllao
committed
Merge branch 'MDL-57742_master' of git://github.com/markn86/moodle
2 parents 17ed12e + 6d32804 commit 1d6dd43

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Diff for: lib/ltiprovider/readme_moodle.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ Some changes from the upstream version have been made:
55
* Define consumer profile member variable for ToolConsumer class
66
* Added context type property for Context class
77
* Set context type if 'context_type' parameter was submitted through POST
8-
These changes can be reverted once the following pull requests have been integrated upstream:
8+
* Do not require tool_consumer_instance_guid
9+
These changes can be reverted once the following pull requests/issues have been integrated upstream:
910
* https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/pull/10/commits/a9a1641f1a593eba4638133245c21d9ad47d8680
1011
* https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/pull/11/commits/0bae60389bd020a02be5554516b86336e651e237
12+
* https://github.com/IMSGlobal/LTI-Tool-Provider-Library-PHP/issues/19
1113

1214
It is recommended by upstream to install depdencies via composer - but the composer installation is bundled
1315
with an autoloader so it's better to do it manually.

Diff for: lib/ltiprovider/src/ToolProvider/ToolProvider.php

-5
Original file line numberDiff line numberDiff line change
@@ -808,11 +808,6 @@ private function authenticate()
808808
if (!$this->ok) {
809809
$this->reason = 'Request is from an invalid tool consumer.';
810810
}
811-
} else {
812-
$this->ok = isset($_POST['tool_consumer_instance_guid']);
813-
if (!$this->ok) {
814-
$this->reason = 'A tool consumer GUID must be included in the launch request.';
815-
}
816811
}
817812
}
818813
if ($this->ok) {

0 commit comments

Comments
 (0)