diff options
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 7 | 
1 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index f4f4abad4a..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); @@ -572,7 +569,7 @@ class ucp_profile  				{  					if (check_form_key('ucp_avatar'))  					{ -						if (avatar_process_user($error)) +						if (avatar_process_user($error, false, $can_upload))  						{  							meta_refresh(3, $this->u_action);  							$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');  | 
