aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_profile.php
diff options
context:
space:
mode:
authorJosh Woody <a_jelly_doughnut@phpbb.com>2010-08-19 09:03:45 -0500
committerJosh Woody <a_jelly_doughnut@phpbb.com>2010-08-19 09:03:45 -0500
commit46d2d97a378e1fc40359d4eff911d352c9b05c20 (patch)
treeaaf1d43c17be2d10d40dd46bed0c54ab71eb720c /phpBB/includes/ucp/ucp_profile.php
parent64e6faa877af36f256da12d122e296f45706d359 (diff)
parentaf21e38c1d6f3fd738c97bd6cf0f96285c0b35aa (diff)
downloadforums-46d2d97a378e1fc40359d4eff911d352c9b05c20.tar
forums-46d2d97a378e1fc40359d4eff911d352c9b05c20.tar.gz
forums-46d2d97a378e1fc40359d4eff911d352c9b05c20.tar.bz2
forums-46d2d97a378e1fc40359d4eff911d352c9b05c20.tar.xz
forums-46d2d97a378e1fc40359d4eff911d352c9b05c20.zip
Merge branch 'ticket/bantu/9611' into develop-olympus
* ticket/bantu/9611: [ticket/9611] Make length of activation keys variable between 6 and 10.
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
-rw-r--r--phpBB/includes/ucp/ucp_profile.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 363a4803b6..4fd25b7d1c 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -141,10 +141,7 @@ class ucp_profile
$server_url = generate_board_url();
- $user_actkey = gen_rand_string(10);
- $key_len = 54 - (strlen($server_url));
- $key_len = ($key_len > 6) ? $key_len : 6;
- $user_actkey = substr($user_actkey, 0, $key_len);
+ $user_actkey = gen_rand_string(mt_rand(6, 10));
$messenger = new messenger(false);