diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2005-11-03 20:53:47 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2005-11-03 20:53:47 +0000 |
| commit | 24efdfcd883eebf36d7f31f1e194bcf4ba444980 (patch) | |
| tree | 14bce2edaf8416d7b934429ec5f4e64e642f6a45 /phpBB/includes/functions.php | |
| parent | 759e33f759a3feeef258765e3599c8a391f66b75 (diff) | |
| download | forums-24efdfcd883eebf36d7f31f1e194bcf4ba444980.tar forums-24efdfcd883eebf36d7f31f1e194bcf4ba444980.tar.gz forums-24efdfcd883eebf36d7f31f1e194bcf4ba444980.tar.bz2 forums-24efdfcd883eebf36d7f31f1e194bcf4ba444980.tar.xz forums-24efdfcd883eebf36d7f31f1e194bcf4ba444980.zip | |
I'm merging a few changes that we made to the session code in 2.0 into
this code stream as well. This should work, but equally it might break
the autologin :-)
git-svn-id: file:///svn/phpbb/trunk@5288 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 477a7f7ac3..75174dadee 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -138,11 +138,12 @@ function gen_rand_string($num_chars) /** * Return unique id +* @param $extra additional entropy for call to mt_srand */ -function unique_id() +function unique_id($extra = 0) { list($sec, $usec) = explode(' ', microtime()); - mt_srand((float) $sec + ((float) $usec * 100000)); + mt_srand((float) $extra + (float) $sec + ((float) $usec * 100000)); return uniqid(mt_rand(), true); } |