diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 14:55:18 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 14:55:18 +0000 |
| commit | 6583f90b8d082096ebd9cfc0588730dd36efb077 (patch) | |
| tree | 36d01de359aafeabe6daa571ea2c0a40da41ab14 /phpBB/includes/ucp/ucp_profile.php | |
| parent | 5c5330c29d3e19eab804d9dbfd0261e6459e00b8 (diff) | |
| download | forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar.gz forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar.bz2 forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar.xz forums-6583f90b8d082096ebd9cfc0588730dd36efb077.zip | |
- bug fixes for #5618, #5588 and #5584
- remove messenger->reset() calls (they are already performed on sending)
git-svn-id: file:///svn/phpbb/trunk@6660 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 92612bfa28..29055f0d89 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -125,7 +125,7 @@ class ucp_profile $key_len = ($key_len > 6) ? $key_len : 6; $user_actkey = substr($user_actkey, 0, $key_len); - $messenger = new messenger(); + $messenger = new messenger(false); $template_file = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? 'user_activate_inactive' : 'user_activate'; $messenger->template($template_file, $user->data['user_lang']); @@ -182,8 +182,6 @@ class ucp_profile $db->sql_freeresult($result); } - $messenger->save_queue(); - user_active_flip('deactivate', $user->data['user_id'], INACTIVE_PROFILE); $sql_ary += array( @@ -605,8 +603,8 @@ class ucp_profile $avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/'; break; } - $avatar_img .= $user->data['user_avatar']; + $avatar_img .= $user->data['user_avatar']; $avatar_img = '<img src="' . $avatar_img . '" width="' . $user->data['user_avatar_width'] . '" height="' . $user->data['user_avatar_height'] . '" alt="" />'; } |