Merge branch 'MDL-32620' of git://github.com/scriby/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2013-02-19 13:13:43 +01:00
commit 1ead0c63e9

View file

@ -162,8 +162,9 @@ function lti_view($instance) {
if (empty($key) || empty($secret)) { if (empty($key) || empty($secret)) {
$returnurlparams['unsigned'] = '1'; $returnurlparams['unsigned'] = '1';
}
//Add the return URL. We send the launch container along to help us avoid frames-within-frames when the user returns // Add the return URL. We send the launch container along to help us avoid frames-within-frames when the user returns
$url = new moodle_url('/mod/lti/return.php', $returnurlparams); $url = new moodle_url('/mod/lti/return.php', $returnurlparams);
$returnurl = $url->out(false); $returnurl = $url->out(false);
@ -172,7 +173,6 @@ function lti_view($instance) {
} }
$requestparams['launch_presentation_return_url'] = $returnurl; $requestparams['launch_presentation_return_url'] = $returnurl;
}
if (!empty($key) && !empty($secret)) { if (!empty($key) && !empty($secret)) {
$parms = lti_sign_parameters($requestparams, $endpoint, "POST", $key, $secret); $parms = lti_sign_parameters($requestparams, $endpoint, "POST", $key, $secret);