diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-07 09:52:30 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-07 09:52:30 +0100 |
| commit | c00e45d30ef43e9dbdd2c90c27e1901e6d02b206 (patch) | |
| tree | ae7c9bdb27b45c6f5ef17fd3c60daf5429526c8b /phpBB | |
| parent | f53a27e891ce38c2728b3c31fd70b9f9896f69bd (diff) | |
| parent | f55a61d067fbc6c36348c3203e965d54b02198fd (diff) | |
| download | forums-c00e45d30ef43e9dbdd2c90c27e1901e6d02b206.tar forums-c00e45d30ef43e9dbdd2c90c27e1901e6d02b206.tar.gz forums-c00e45d30ef43e9dbdd2c90c27e1901e6d02b206.tar.bz2 forums-c00e45d30ef43e9dbdd2c90c27e1901e6d02b206.tar.xz forums-c00e45d30ef43e9dbdd2c90c27e1901e6d02b206.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php b/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php index aad8e44681..295f2d2a14 100644 --- a/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php +++ b/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php @@ -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); } |