4 files changed, 12 insertions, 12 deletions
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php
index e681ebab96..84bba18bb7 100755
--- a/phpBB/includes/mcp/mcp_notes.php
+++ b/phpBB/includes/mcp/mcp_notes.php
@@ -142,6 +142,7 @@ class mcp_notes
 //		get_user_rank($userrow['user_rank'], $userrow['user_posts'], $rank_title, $rank_img);
 
 		$avatar_img = '';
+
 		if (!empty($userrow['user_avatar']))
 		{
 			switch ($userrow['user_avatar_type'])
@@ -154,8 +155,8 @@ class mcp_notes
 					$avatar_img = $config['avatar_gallery_path'] . '/';
 				break;
 			}
-			$avatar_img .= $userrow['user_avatar'];
 
+			$avatar_img .= $userrow['user_avatar'];
 			$avatar_img = '<img src="' . $avatar_img . '" width="' . $userrow['user_avatar_width'] . '" height="' . $userrow['user_avatar_height'] . '" alt="" />';
 		}
 
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 32aaa3e533..df23bcd98f 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -558,12 +558,11 @@ function approve_post($post_id_list, $mode)
 				);
 
 				$messenger->send($post_data['user_notify_type']);
-				$messenger->reset();
 			}
-
-			$messenger->save_queue();
 		}
 
+		$messenger->save_queue();
+
 		// Send out normal user notifications
 		$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
 
@@ -780,13 +779,12 @@ function disapprove_post($post_id_list, $mode)
 				);
 
 				$messenger->send($post_data['user_notify_type']);
-				$messenger->reset();
 			}
-
-			$messenger->save_queue();
 		}
 		unset($post_info, $disapprove_reason);
 
+		$messenger->save_queue();
+
 		if (sizeof($forum_topics_real))
 		{
 			$success_msg = ($num_disapproved == 1) ? 'TOPIC_DISAPPROVED_SUCCESS' : 'TOPICS_DISAPPROVED_SUCCESS';
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index 709d685e88..7a84c872a5 100755
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -494,13 +494,12 @@ function close_report($post_id_list, $mode, $action)
 				);
 
 				$messenger->send($reporter['user_notify_type']);
-				$messenger->reset();
 			}
-
-			$messenger->save_queue();
 		}
 		unset($notify_reporters, $post_info);
 
+		$messenger->save_queue();
+
 		$success_msg = (sizeof($post_id_list) == 1) ? 'REPORT_' . strtoupper($action) . 'D_SUCCESS' : 'REPORTS_' . strtoupper($action) . 'D_SUCCESS';
 	}
 	else
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 4206582d01..ef8d0132fc 100755
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -275,6 +275,7 @@ function mcp_warn_post_view($id, $mode, $action)
 //	get_user_rank($userrow['user_rank'], $userrow['user_posts'], $rank_title, $rank_img);
 
 	$avatar_img = '';
+
 	if (!empty($userrow['user_avatar']))
 	{
 		switch ($userrow['user_avatar_type'])
@@ -287,8 +288,8 @@ function mcp_warn_post_view($id, $mode, $action)
 				$avatar_img = $config['avatar_gallery_path'] . '/';
 			break;
 		}
-		$avatar_img .= $userrow['user_avatar'];
 
+		$avatar_img .= $userrow['user_avatar'];
 		$avatar_img = '<img src="' . $avatar_img . '" width="' . $userrow['user_avatar_width'] . '" height="' . $userrow['user_avatar_height'] . '" alt="" />';
 	}
 
@@ -359,6 +360,7 @@ function mcp_warn_user_view($id, $mode, $action)
 //	get_user_rank($userrow['user_rank'], $userrow['user_posts'], $rank_title, $rank_img);
 
 	$avatar_img = '';
+
 	if (!empty($userrow['user_avatar']))
 	{
 		switch ($userrow['user_avatar_type'])
@@ -371,8 +373,8 @@ function mcp_warn_user_view($id, $mode, $action)
 				$avatar_img = $config['avatar_gallery_path'] . '/';
 			break;
 		}
-		$avatar_img .= $userrow['user_avatar'];
 
+		$avatar_img .= $userrow['user_avatar'];
 		$avatar_img = '<img src="' . $avatar_img . '" width="' . $userrow['user_avatar_width'] . '" height="' . $userrow['user_avatar_height'] . '" alt="" />';
 	}