diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2017-09-08 16:06:47 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2017-09-08 16:06:47 +0200 |
| commit | 16da17a4ba4b55404dba2b3416d8c62971ba16ca (patch) | |
| tree | 6db2be536f8c17411309d916934a4ecb075549ed /phpBB | |
| parent | b75a9dcbe3393deb226303f9765be7f20851ae3a (diff) | |
| parent | 93621aa1844ab48d9bae068d9872d2c49ae86de4 (diff) | |
| download | forums-16da17a4ba4b55404dba2b3416d8c62971ba16ca.tar forums-16da17a4ba4b55404dba2b3416d8c62971ba16ca.tar.gz forums-16da17a4ba4b55404dba2b3416d8c62971ba16ca.tar.bz2 forums-16da17a4ba4b55404dba2b3416d8c62971ba16ca.tar.xz forums-16da17a4ba4b55404dba2b3416d8c62971ba16ca.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/console/command/fixup/update_hashes.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/cron/task/core/update_hashes.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/phpbb/console/command/fixup/update_hashes.php b/phpBB/phpbb/console/command/fixup/update_hashes.php index 4bcc3b5d19..9a0e9bc798 100644 --- a/phpBB/phpbb/console/command/fixup/update_hashes.php +++ b/phpBB/phpbb/console/command/fixup/update_hashes.php @@ -101,9 +101,9 @@ class update_hashes extends \phpbb\console\command\command { $new_hash = $this->passwords_manager->hash($row['user_password'], array($this->default_type)); - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_password = "' . $this->db->sql_escape($new_hash) . '" - WHERE user_id = ' . (int) $row['user_id']; + $sql = 'UPDATE ' . USERS_TABLE . " + SET user_password = '" . $this->db->sql_escape($new_hash) . "' + WHERE user_id = " . (int) $row['user_id']; $this->db->sql_query($sql); $progress_bar->advance(); } diff --git a/phpBB/phpbb/cron/task/core/update_hashes.php b/phpBB/phpbb/cron/task/core/update_hashes.php index a4fe477d99..ba095abc8b 100644 --- a/phpBB/phpbb/cron/task/core/update_hashes.php +++ b/phpBB/phpbb/cron/task/core/update_hashes.php @@ -111,9 +111,9 @@ class update_hashes extends \phpbb\cron\task\base // Increase number so we know that users were selected from the database $affected_rows++; - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_password = "' . $this->db->sql_escape($new_hash) . '" - WHERE user_id = ' . (int) $row['user_id']; + $sql = 'UPDATE ' . USERS_TABLE . " + SET user_password = '" . $this->db->sql_escape($new_hash) . "' + WHERE user_id = " . (int) $row['user_id']; $this->db->sql_query($sql); } |