From 4698f6928e44a24a7a10ff8b4fed2c1a24cab338 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 30 May 2014 23:00:57 +0200 Subject: [ticket/12352] Remove usages of user_pass_convert column PHPBB3-12352 --- phpBB/phpbb/auth/provider/db.php | 5 ++--- phpBB/phpbb/auth/provider/oauth/oauth.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'phpBB/phpbb/auth') diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index 7307a697ae..142a47247f 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -78,7 +78,7 @@ class db extends \phpbb\auth\provider\base $username_clean = utf8_clean_string($username); - $sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts + $sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type, user_login_attempts FROM ' . USERS_TABLE . " WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'"; $result = $this->db->sql_query($sql); @@ -180,8 +180,7 @@ class db extends \phpbb\auth\provider\base // Update the password in the users table to the new format $sql = 'UPDATE ' . USERS_TABLE . " - SET user_password = '" . $this->db->sql_escape($hash) . "', - user_pass_convert = 0 + SET user_password = '" . $this->db->sql_escape($hash) . "' WHERE user_id = {$row['user_id']}"; $this->db->sql_query($sql); diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index 2230ce15d1..07430bb42a 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -215,7 +215,7 @@ class oauth extends \phpbb\auth\provider\base } // Retrieve the user's account - $sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts + $sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type, user_login_attempts FROM ' . $this->users_table . ' WHERE user_id = ' . (int) $row['user_id']; $result = $this->db->sql_query($sql); -- cgit v1.2.1 er'>committer
path: root/zarb-ml/mageia-dev/20110210/index.html
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-04-10 16:59:28 +0000
committerNicolas Vigier <boklm@mageia.org>2013-04-10 16:59:28 +0000
commit447e889da00ded0a42fa92b9a443e3e4323c14e7 (patch)
tree495c5668a137eb3a573ccd25e060d7d98fc0343c /zarb-ml/mageia-dev/20110210/index.html
parent97ed07b8a7dd69c2f7867958631b4bace365ee08 (diff)
downloadarchives-447e889da00ded0a42fa92b9a443e3e4323c14e7.tar
archives-447e889da00ded0a42fa92b9a443e3e4323c14e7.tar.gz
archives-447e889da00ded0a42fa92b9a443e3e4323c14e7.tar.bz2
archives-447e889da00ded0a42fa92b9a443e3e4323c14e7.tar.xz
archives-447e889da00ded0a42fa92b9a443e3e4323c14e7.zip
archives: add index file
Diffstat (limited to 'zarb-ml/mageia-dev/20110210/index.html')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.1 (git 2.21.0) at 2025-12-24 17:03:23 +0000