aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-01-16 17:36:21 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-01-16 17:36:21 +0000
commit5866ee91014116cb5c111ede4be29afe98054bb7 (patch)
tree9e386ad40a23ec2980a5ccbbddf0927da4cbee9e /phpBB
parent6bfa84bb7455477feb2183a98bcbd25da9545c06 (diff)
downloadforums-5866ee91014116cb5c111ede4be29afe98054bb7.tar
forums-5866ee91014116cb5c111ede4be29afe98054bb7.tar.gz
forums-5866ee91014116cb5c111ede4be29afe98054bb7.tar.bz2
forums-5866ee91014116cb5c111ede4be29afe98054bb7.tar.xz
forums-5866ee91014116cb5c111ede4be29afe98054bb7.zip
erm, unique_id() should return a result
git-svn-id: file:///svn/phpbb/trunk@9266 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/core/security.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/core/security.php b/phpBB/includes/core/security.php
index be7f4950f4..5079c361a2 100644
--- a/phpBB/includes/core/security.php
+++ b/phpBB/includes/core/security.php
@@ -78,6 +78,7 @@ class phpbb_security extends phpbb_plugin_support
return substr($val, 4, 16);
}
+
$val = phpbb::$config['rand_seed'] . microtime();
$val = md5($val);
phpbb::$config['rand_seed'] = md5(phpbb::$config['rand_seed'] . $val . $extra);
@@ -90,7 +91,7 @@ class phpbb_security extends phpbb_plugin_support
$this->dss_seeded = true;
}
- $result = substr($val, 4, 16);
+ return substr($val, 4, 16);
}
/**