aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-06-17 10:00:26 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-06-17 10:00:26 +0200
commit8f3f7d1e5e2342941435cd75bb8c43fd66505360 (patch)
tree939213a219d3f6514d16956001be2ed42716f880 /phpBB/phpbb
parent5741c8d8ee8ef0bb934c432278510cef1c1e90b8 (diff)
parent951b097761d7e5f989008b7166b74b8a8fb12615 (diff)
downloadforums-8f3f7d1e5e2342941435cd75bb8c43fd66505360.tar
forums-8f3f7d1e5e2342941435cd75bb8c43fd66505360.tar.gz
forums-8f3f7d1e5e2342941435cd75bb8c43fd66505360.tar.bz2
forums-8f3f7d1e5e2342941435cd75bb8c43fd66505360.tar.xz
forums-8f3f7d1e5e2342941435cd75bb8c43fd66505360.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/auth/provider/oauth/oauth.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index 5e8cb3dea8..1a3083d42e 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -264,7 +264,7 @@ class oauth extends \phpbb\auth\provider\base
}
// Retrieve the user's account
- $sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type, user_login_attempts
+ $sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_ip, user_type, user_login_attempts
FROM ' . $this->users_table . '
WHERE user_id = ' . (int) $row['user_id'];
$result = $this->db->sql_query($sql);