From 310caec5d92d58453d1eee40e9b5a7f0157bd5ea Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Sat, 24 Aug 2013 21:34:23 -0400
Subject: [feature/oauth] Fix redirects

PHPBB3-11673
---
 phpBB/phpbb/auth/auth.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'phpBB/phpbb/auth/auth.php')

diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php
index 400f5fef6d..5093483d4a 100644
--- a/phpBB/phpbb/auth/auth.php
+++ b/phpBB/phpbb/auth/auth.php
@@ -975,12 +975,9 @@ class phpbb_auth
 			{
 				// If this status exists a fourth field is in the $login array called 'redirect_data'
 				// This data is passed along as GET data to the next page allow the account to be linked
-				$url = 'ucp.php?mode=login_link';
 
-				foreach ($login['redirect_data'] as $key => $value)
-				{
-					$url .= '&' . $key . '=' . $value;
-				}
+				$params = array('mode' => 'login_link');
+				$url = append_sid('ucp.' . $phpEx, array_merge($params, $login['redirect_data']));
 
 				redirect($url);
 			}
-- 
cgit v1.2.1