aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-04-07 10:28:52 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-04-07 10:28:52 +0200
commitbe86694305f87893cf1ced845af278fd8bf9fee3 (patch)
treefcc30bb7bb7f6ce10036958c12b01954ace982bb /phpBB
parentb693798a9663a9e1488a7c2866a95ed143cabfb2 (diff)
parentaf994e7a390eea1125d63a6d0e2ef7b945549669 (diff)
downloadforums-be86694305f87893cf1ced845af278fd8bf9fee3.tar
forums-be86694305f87893cf1ced845af278fd8bf9fee3.tar.gz
forums-be86694305f87893cf1ced845af278fd8bf9fee3.tar.bz2
forums-be86694305f87893cf1ced845af278fd8bf9fee3.tar.xz
forums-be86694305f87893cf1ced845af278fd8bf9fee3.zip
Merge pull request #5558 from mrgoldy/ticket/16006
[ticket/16006] Create unique ID's for OAuth (un)linking
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/auth/provider/oauth/oauth.php1
-rw-r--r--phpBB/styles/prosilver/template/ucp_auth_link_oauth.html2
2 files changed, 2 insertions, 1 deletions
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">