Merge branch 'MDL-39090_lti_dup_params' of https://github.com/moodlerooms/moodle

2013-08-06 10:23:45 +12:00
parent 911b271215 533c42ea28
commit c7c020aad2
1 changed files with 13 additions and 0 deletions
@@ -176,6 +176,19 @@ function lti_view($instance) {

    if (!empty($key) && !empty($secret)) {
        $parms = lti_sign_parameters($requestparams, $endpoint, "POST", $key, $secret);
+
+        $endpointurl = new moodle_url($endpoint);
+        $endpointparams = $endpointurl->params();
+
+        // Strip querystring params in endpoint url from $parms to avoid duplication.
+        if (!empty($endpointparams) && !empty($parms)) {
+            foreach (array_keys($endpointparams) as $paramname) {
+                if (isset($parms[$paramname])) {
+                    unset($parms[$paramname]);
+                }
+            }
+        }
+
    } else {
        //If no key and secret, do the launch unsigned.
        $parms = $requestparams;