3 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index e4a38f2b04..1536411e9d 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -196,7 +196,6 @@ class ucp_groups
 									);
 
 									$messenger->send($row['user_notify_type']);
-									$messenger->reset();
 								}
 								$db->sql_freeresult($result);
 
@@ -575,6 +574,8 @@ class ucp_groups
 
 						if (isset($group_row['group_avatar']) && $group_row['group_avatar'])
 						{
+							$avatar_img = '';
+
 							switch ($group_row['group_avatar_type'])
 							{
 								case AVATAR_UPLOAD:
@@ -585,8 +586,8 @@ class ucp_groups
 									$avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/';
 								break;
 							}
-							$avatar_img .= $group_row['group_avatar'];
 
+							$avatar_img .= $group_row['group_avatar'];
 							$avatar_img = '<img src="' . $avatar_img . '" width="' . $group_row['group_avatar_width'] . '" height="' . $group_row['group_avatar_height'] . '" alt="" />';
 						}
 						else
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index cc23fc0fce..9a19baa257 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -426,6 +426,7 @@ function get_user_information($user_id, $user_row)
 	if ($user_row['user_avatar'] && $user->optionget('viewavatars'))
 	{
 		$avatar_img = '';
+
 		switch ($user_row['user_avatar_type'])
 		{
 			case AVATAR_UPLOAD:
@@ -436,8 +437,8 @@ function get_user_information($user_id, $user_row)
 				$avatar_img = $config['avatar_gallery_path'] . '/';
 			break;
 		}
-		$avatar_img .= $user_row['user_avatar'];
 
+		$avatar_img .= $user_row['user_avatar'];
 		$user_row['avatar'] = '<img src="' . $avatar_img . '" width="' . $user_row['user_avatar_width'] . '" height="' . $user_row['user_avatar_height'] . '" alt="' . $user->lang['USER_AVATAR'] . '" />';
 	}
 
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="" />';
 				}