diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-02-22 19:37:09 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-02-22 19:37:09 +0000 |
| commit | 4f439593ced5a6433d844f6cb8b22df13b8401b5 (patch) | |
| tree | ccfddb34bb35eb632a1e1b51b7f30c9b0c51c87e | |
| parent | 87bc1c67609abb39a3d17521da0540ed1c2d8173 (diff) | |
| download | forums-4f439593ced5a6433d844f6cb8b22df13b8401b5.tar forums-4f439593ced5a6433d844f6cb8b22df13b8401b5.tar.gz forums-4f439593ced5a6433d844f6cb8b22df13b8401b5.tar.bz2 forums-4f439593ced5a6433d844f6cb8b22df13b8401b5.tar.xz forums-4f439593ced5a6433d844f6cb8b22df13b8401b5.zip | |
Merge r10520 into 3.0.7 branch.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10521 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/install/database_update.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index f5ff282279..9bb09747da 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1615,7 +1615,9 @@ function change_database_data(&$no_updates, $version) $i = 0; while ($row = $db->sql_fetchrow($result)) { - $user_email_hash = phpbb_email_hash($row['user_email']); + // Snapshot of the phpbb_email_hash() function + // We cannot call it directly because the auto updater updates the DB first. :/ + $user_email_hash = sprintf('%u', crc32(strtolower($row['user_email']))) . strlen($row['user_email']); if ($user_email_hash != $row['user_email_hash']) { |