From 641267949af1bba7caa5f1e8529e339d7aaf489f Mon Sep 17 00:00:00 2001
From: Andjelko Horvat <comel@vingd.com>
Date: Mon, 18 Nov 2013 17:21:04 +0000
Subject: [PATCH] oauth: proper building of authorize URL (related to #587).

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3294 44740490-163a-0410-bde0-09ae8108e29a
---
 modules/oauth/lib/Consumer.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/oauth/lib/Consumer.php b/modules/oauth/lib/Consumer.php
index 33c33fd6a..734fd4336 100644
--- a/modules/oauth/lib/Consumer.php
+++ b/modules/oauth/lib/Consumer.php
@@ -88,10 +88,11 @@ class sspmod_oauth_Consumer {
 	}
 	
 	public function getAuthorizeRequest($url, $requestToken, $redirect = TRUE, $callback = NULL) {
-		$authorizeURL = $url . '?oauth_token=' . $requestToken->key;
+		$params = array('oauth_token' => $requestToken->key);
 		if ($callback) {
-			$authorizeURL .= '&oauth_callback=' . urlencode($callback);
+			$params['oauth_callback'] = $callback;
 		}
+		$authorizeURL = SimpleSAML_Utilities::addURLparameter($url, $params);
 		if ($redirect) {
 			SimpleSAML_Utilities::redirect($authorizeURL);
 			exit;
-- 
GitLab