makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 20:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2019-04-07 10:28:57 +02:00
commit 1cf0ecf14c
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/phpbb/auth/provider/oauth/oauth.php
View file

@ -674,6 +674,7 @@ class oauth extends \phpbb\auth\provider\base
'oauth_service' => $actual_name, 'oauth_service' => $actual_name,
), ),
'SERVICE_ID' => $actual_name,
'SERVICE_NAME' => $this->user->lang['AUTH_PROVIDER_OAUTH_SERVICE_' . strtoupper($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, 'UNIQUE_ID' => (isset($oauth_user_ids[$actual_name])) ? $oauth_user_ids[$actual_name] : null,
); );

2
phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
View file

@ -1,5 +1,5 @@
<!-- BEGIN oauth --> <!-- 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> <h3>{oauth.SERVICE_NAME}</h3>
<fieldset class="fields2"> <fieldset class="fields2">