diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-08-12 14:43:18 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-08-12 14:43:35 -0400 |
| commit | 4003e077c170e2c9aebbf582cb08249d80d37a3d (patch) | |
| tree | 5976801053eb456db4ac49b168cddee00a1fdc0d /phpBB/phpbb | |
| parent | e04844c95f52c6da295d20bccc9530ee7e4b63f7 (diff) | |
| download | forums-4003e077c170e2c9aebbf582cb08249d80d37a3d.tar forums-4003e077c170e2c9aebbf582cb08249d80d37a3d.tar.gz forums-4003e077c170e2c9aebbf582cb08249d80d37a3d.tar.bz2 forums-4003e077c170e2c9aebbf582cb08249d80d37a3d.tar.xz forums-4003e077c170e2c9aebbf582cb08249d80d37a3d.zip | |
[feature/oauth] Get the OAuth template in place for ucp_auth_link
PHPBB3-11673
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/oauth.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index d0b5583d77..1b0674a13b 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -452,7 +452,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base // Get all external accounts tied to the current user $data = array( - 'user_id' => $user->data['user_id'], + 'user_id' => $this->user->data['user_id'], ); $sql = 'SELECT oauth_provider_id, provider FROM ' . $this->auth_provider_oauth_token_account_assoc . ' WHERE ' . $this->db->sql_build_array('SELECT', $data); @@ -462,9 +462,9 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base $oauth_user_ids = array(); - if ($row !== false && !empty($rows)) + if ($rows !== false && !empty($rows)) { - foreach ($row as $row) + foreach ($rows as $row) { $oauth_user_ids[$row['provider']] = $row['oauth_provider_id']; } |