aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorJoseph Warner <hardolaf@hardolaf.com>2013-08-02 14:21:07 -0400
committerJoseph Warner <hardolaf@hardolaf.com>2013-08-02 14:21:25 -0400
commit1ae2283b348d6fef1f9e90a49e2a25914465585e (patch)
tree0e69202b36716363f77e5e52fc32c41cad42d616 /phpBB/phpbb
parent245e71e4e20b8d4ec80fc5e059dc12db51d10651 (diff)
downloadforums-1ae2283b348d6fef1f9e90a49e2a25914465585e.tar
forums-1ae2283b348d6fef1f9e90a49e2a25914465585e.tar.gz
forums-1ae2283b348d6fef1f9e90a49e2a25914465585e.tar.bz2
forums-1ae2283b348d6fef1f9e90a49e2a25914465585e.tar.xz
forums-1ae2283b348d6fef1f9e90a49e2a25914465585e.zip
[feature/oauth] Finish updating interface and related code
PHPBB3-11673
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/auth/provider/oauth/oauth.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index 62024ff094..1cc19d143e 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -278,7 +278,11 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
*/
public function get_login_data()
{
- $login_data = array();
+ $login_data = array(
+ 'TEMPLATE_FILE' => 'login_body_oauth.html',
+ 'BLOCK_VAR_NAME' => 'oauth',
+ 'BLOCK_VARS' => array(),
+ );
foreach ($this->service_providers as $service_name => $service_provider)
{
@@ -288,7 +292,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
{
$actual_name = str_replace('auth.provider.oauth.service.', '', $service_name);
$redirect_url = build_url(false) . '&login=external&oauth_service=' . $actual_name;
- $login_data[$service_name] = array(
+ $login_data['BLOCK_VARS'][$service_name] = array(
'REDIRECT_URL' => redirect($redirect_url, true),
'SERVICE_NAME' => $this->user->lang['AUTH_PROVIDER_OAUTH_SERVICE_' . strtoupper($actual_name)],
);