1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-13 12:22:03 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-03-07 09:52:36 +01:00
commit a1b7a5aedc

View File

@ -56,19 +56,16 @@ class passwords_convert_p1 extends \phpbb\db\migration\migration
{
// Use $CP$ prefix for passwords that need to
// be converted and set pass convert to false.
$update_users[$user_id] = array(
'user_password' => '$CP$' . $row['user_password'],
'user_pass_convert' => 0,
);
$update_users[$user_id] = '$CP$' . $row['user_password'];
}
}
$this->db->sql_freeresult($result);
foreach ($update_users as $user_id => $user_data)
foreach ($update_users as $user_id => $user_password)
{
$sql = 'UPDATE ' . $this->table_prefix . 'users
SET ' . $this->db->sql_build_array('UPDATE', $user_data) . '
WHERE user_id = ' . $user_id;
$sql = 'UPDATE ' . $this->table_prefix . "users
SET user_password = '" . $this->db->sql_escape($user_password) . "'
WHERE user_id = $user_id";
$this->sql_query($sql);
}