diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-02-18 01:40:51 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-02-18 01:40:51 +0000 |
| commit | dccd529498a879d4620e5878acd0435274f3182b (patch) | |
| tree | 14bbfc40a90f468df039e2f62144075f49fafc17 /phpBB/includes | |
| parent | b68d23347a03ff0f7b3fe9dbdddd93675f812776 (diff) | |
| download | forums-dccd529498a879d4620e5878acd0435274f3182b.tar forums-dccd529498a879d4620e5878acd0435274f3182b.tar.gz forums-dccd529498a879d4620e5878acd0435274f3182b.tar.bz2 forums-dccd529498a879d4620e5878acd0435274f3182b.tar.xz forums-dccd529498a879d4620e5878acd0435274f3182b.zip | |
Merge r10497 and r10499 into 3.0.7 - #57755
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10502 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_convert.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 823c71dbf0..81a11f4867 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -556,11 +556,11 @@ function _hash_crypt_private($password, $setting, &$itoa64) * * @param string $email Email address * -* @return string Big Integer +* @return string Unsigned Big Integer */ function phpbb_email_hash($email) { - return crc32(strtolower($email)) . strlen($email); + return sprintf('%u', crc32(strtolower($email))) . strlen($email); } /** diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 8a1d07c8e5..048212bcfe 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -205,10 +205,12 @@ function get_group_id($group_name) /** * Generate the email hash stored in the users table +* +* Note: Deprecated, calls should directly go to phpbb_email_hash() */ function gen_email_hash($email) { - return (crc32(strtolower($email)) . strlen($email)); + return phpbb_email_hash($email); } /** |