aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2010-08-20 20:56:17 +0100
committerChris Smith <toonarmy@phpbb.com>2010-08-20 20:56:17 +0100
commitde8c334aeb0652b70c164e26056eddb164b29e86 (patch)
treeadac210bb4b597ad822feb7429b61b35d97b47b8 /phpBB
parent0ee49ca432a4ba334c529e973dd10c85f38452f4 (diff)
parente09d6c6d7139375d8b645664bef295c82d585653 (diff)
downloadforums-de8c334aeb0652b70c164e26056eddb164b29e86.tar
forums-de8c334aeb0652b70c164e26056eddb164b29e86.tar.gz
forums-de8c334aeb0652b70c164e26056eddb164b29e86.tar.bz2
forums-de8c334aeb0652b70c164e26056eddb164b29e86.tar.xz
forums-de8c334aeb0652b70c164e26056eddb164b29e86.zip
Merge branch 'ticket/bantu/9780' into develop-olympus
* ticket/bantu/9780: [ticket/9780] Adding unit tests for gen_rand_string(). [ticket/9780] Add length check back to gen_rand_string().
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 980a26d525..36b9e18176 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -201,7 +201,7 @@ function set_config_count($config_name, $increment, $is_dynamic = false)
function gen_rand_string($num_chars = 8)
{
// [a, z] + [0, 9] = 36
- return strtoupper(base_convert(unique_id(), 16, 36));
+ return substr(strtoupper(base_convert(unique_id(), 16, 36)), 0, $num_chars);
}
/**