3 files changed, 13 insertions, 5 deletions
diff --git a/phpBB/admin/admin_db_utilities.php b/phpBB/admin/admin_db_utilities.php
index e4045a79af..cc33c7a606 100644
--- a/phpBB/admin/admin_db_utilities.php
+++ b/phpBB/admin/admin_db_utilities.php
@@ -956,8 +956,8 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
 
 							if(!$result && ( !(SQL_LAYER == 'postgres' && eregi("drop table", $sql) ) ) )
 							{
-								include('page_header_admin.'.$phpEx);
-								echo "~~$sql~~";
+								//include('page_header_admin.'.$phpEx);
+								// echo "~~$sql~~";
 								message_die(GENERAL_ERROR, "Error importing backup file", "", __LINE__, __FILE__, $sql);
 							}
 						}
diff --git a/phpBB/admin/admin_groups.php b/phpBB/admin/admin_groups.php
index 85a9c73ee4..d74a9bc392 100644
--- a/phpBB/admin/admin_groups.php
+++ b/phpBB/admin/admin_groups.php
@@ -63,7 +63,7 @@ if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
 		}
 		if( !$db->sql_numrows($result) )
 		{
-			message_die(GENERAL_MESSAGE, "That user group does not exist");
+			message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
 		}
 		$group_info = $db->sql_fetchrow($result);
 
@@ -199,7 +199,7 @@ else if( isset($HTTP_POST_VARS['group_update']) )
 			}
 			if( !$db->sql_numrows($result) )
 			{
-				message_die(GENERAL_MESSAGE, "That user group does not exist");
+				message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
 			}
 			$group_info = $db->sql_fetchrow($result);		
 		
diff --git a/phpBB/admin/admin_mass_email.php b/phpBB/admin/admin_mass_email.php
index a3e3b0657a..17fbdc4245 100644
--- a/phpBB/admin/admin_mass_email.php
+++ b/phpBB/admin/admin_mass_email.php
@@ -43,7 +43,14 @@ require('pagestart.inc');
 //
 // Set VERBOSE to 1  for debugging info..
 //
-define("VERBOSE", 0);
+if(DEBUG)
+{
+	define("VERBOSE", 1);
+}
+else
+{
+	define("VERBOSE", 0);
+}
 
 //
 // Increase maximum execution time in case of a lot of users, but don't complain about it if it isn't
@@ -88,6 +95,7 @@ if(isset($HTTP_POST_VARS['submit']))
 		}
 		$email_headers .= $g_list[$i]['user_email'];
 	}
+	
 	mail($board_config['board_email'],$HTTP_POST_VARS["$f_title"],$HTTP_POST_VARS["$f_msg"],$email_headers);
 	$notice = $lang['Messages'].' '.$lang['Sent'].'!';
 }