aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Warner <hardolaf@hardolaf.com>2013-07-31 14:46:31 -0400
committerJoseph Warner <hardolaf@hardolaf.com>2013-07-31 14:46:45 -0400
commit3b19d5c1984c26a137013f0c60a45001321bfa88 (patch)
tree5b588b76fb5c0cc17459f23453b9b2e280f28528
parentb6d93d21bade3cab9f9434e6a87802913587feae (diff)
downloadforums-3b19d5c1984c26a137013f0c60a45001321bfa88.tar
forums-3b19d5c1984c26a137013f0c60a45001321bfa88.tar.gz
forums-3b19d5c1984c26a137013f0c60a45001321bfa88.tar.bz2
forums-3b19d5c1984c26a137013f0c60a45001321bfa88.tar.xz
forums-3b19d5c1984c26a137013f0c60a45001321bfa88.zip
[feature/oauth] Fix errors on ucp_login_link
PHPBB3-11673
-rw-r--r--phpBB/includes/ucp/ucp_login_link.php9
1 files changed, 4 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_login_link.php b/phpBB/includes/ucp/ucp_login_link.php
index e60628e3c1..9f2fa6330a 100644
--- a/phpBB/includes/ucp/ucp_login_link.php
+++ b/phpBB/includes/ucp/ucp_login_link.php
@@ -28,6 +28,7 @@ class ucp_login_link
function main($id, $mode)
{
global $config, $phpbb_container, $request, $template, $user;
+ global $phpbb_root_path, $phpEx;
// Initialize necessary variables
$login_error = null;
@@ -94,7 +95,7 @@ class ucp_login_link
'LOGIN_LINK_ERROR' => $login_link_error,
'PASSWORD_CREDENTIAL' => 'login_password',
'USERNAME_CREDENTIAL' => 'login_username',
- 'S_HIDDEN_FIELDS' => $this->get_hidden_fields(),
+ 'S_HIDDEN_FIELDS' => $this->get_hidden_fields($data),
// Registration elements
'REGISTER_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'),
@@ -108,10 +109,8 @@ class ucp_login_link
$this->page_title = 'UCP_LOGIN_LINK';
}
- protected function get_register_hidden_fields($data)
+ protected function get_hidden_fields($data)
{
- global $config, $phpbb_root_path, $phpEx, $request;
-
$fields = array();
foreach ($data as $key => $value)
@@ -119,7 +118,7 @@ class ucp_login_link
$fields['login_link_' . $key] = $value;
}
- return build_hidden_fields($s_hidden_fields);
+ return build_hidden_fields($fields);
}
protected function get_login_link_data_array()