From 7b61ac39d2674f3ce9f7a5dadc4ea85d7ded8f50 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Mon, 4 Jun 2012 11:25:19 +0800 Subject: [PATCH 1/1] MDL-33507 - oauth2lib: switch 'code' to oauth2code To avoid param collisions in future. --- admin/oauth2callback.php | 2 +- lib/oauthlib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/oauth2callback.php b/admin/oauth2callback.php index 2ec8c38aead..c032a9c2f16 100644 --- a/admin/oauth2callback.php +++ b/admin/oauth2callback.php @@ -39,7 +39,7 @@ $redirecturl = new moodle_url($state); $params = $redirecturl->params(); if (isset($params['sesskey']) and confirm_sesskey($params['sesskey'])) { - $redirecturl->param('code', $code); + $redirecturl->param('oauth2code', $code); redirect($redirecturl); } else { print_error('invalidsesskey'); diff --git a/lib/oauthlib.php b/lib/oauthlib.php index 88cd53c277d..587ba195b60 100644 --- a/lib/oauthlib.php +++ b/lib/oauthlib.php @@ -425,7 +425,7 @@ abstract class oauth2_client extends curl { // If we've been passed then authorization code generated by the // authorization server try and upgrade the token to an access token. - $code = optional_param('code', null, PARAM_RAW); + $code = optional_param('oauth2code', null, PARAM_RAW); if ($code && $this->upgrade_token($code)) { return true; } -- 2.17.1