From af994e7a390eea1125d63a6d0e2ef7b945549669 Mon Sep 17 00:00:00 2001
From: mrgoldy <gijsmartens1@gmail.com>
Date: Tue, 2 Apr 2019 10:59:36 +0200
Subject: [PATCH] [ticket/16006] Create unique ID's for OAuth (un)linking

PHPBB3-16006
---
 phpBB/phpbb/auth/provider/oauth/oauth.php                | 1 +
 phpBB/styles/prosilver/template/ucp_auth_link_oauth.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index 8809a0c6b4..3e9b424e8d 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -674,6 +674,7 @@ class oauth extends \phpbb\auth\provider\base
 						'oauth_service' => $actual_name,
 					),
 
+					'SERVICE_ID'	=> $actual_name,
 					'SERVICE_NAME'	=> $this->user->lang['AUTH_PROVIDER_OAUTH_SERVICE_' . strtoupper($actual_name)],
 					'UNIQUE_ID'		=> (isset($oauth_user_ids[$actual_name])) ? $oauth_user_ids[$actual_name] : null,
 				);
diff --git a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
index 18316613b0..60061a3139 100644
--- a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
+++ b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
@@ -1,5 +1,5 @@
 <!-- BEGIN oauth -->
-	<form id="ucp" method="post" action="{S_UCP_ACTION}">
+	<form id="ucp_oauth_{oauth.SERVICE_ID}" method="post" action="{S_UCP_ACTION}">
 		<h3>{oauth.SERVICE_NAME}</h3>
 
 		<fieldset class="fields2">