From 13f59975540db2e854490916f787514a8fa77ee5 Mon Sep 17 00:00:00 2001
From: mrgoldy <gijsmartens1@gmail.com>
Date: Tue, 4 Feb 2020 19:16:43 +0100
Subject: [PATCH] [ticket/16344] Move DOMAIN_NO_MX_RECORD_EMAIL to common.php

PHPBB3-16344
---
 phpBB/language/en/common.php | 37 ++++++++++++++++++------------------
 phpBB/language/en/ucp.php    |  1 -
 phpBB/memberlist.php         |  2 --
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 6a27e6b89d..72705bb4f7 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -190,24 +190,25 @@ $lang = array_merge($lang, array(
 	'COOKIES_DELETED'		=> 'All board cookies successfully deleted.',
 	'CURRENT_TIME'			=> 'It is currently %s',
 
-	'DAY'					=> 'Day',
-	'DAYS'					=> 'Days',
-	'DELETE'				=> 'Delete',
-	'DELETE_ALL'			=> 'Delete all',
-	'DELETE_COOKIES'		=> 'Delete cookies',
-	'DELETE_MARKED'			=> 'Delete marked',
-	'DELETE_POST'			=> 'Delete post',
-	'DELIMITER'				=> 'Delimiter',
-	'DESCENDING'			=> 'Descending',
-	'DISABLED'				=> 'Disabled',
-	'DISPLAY'				=> 'Display',
-	'DISPLAY_GUESTS'		=> 'Display guests',
-	'DISPLAY_MESSAGES'		=> 'Display messages from previous',
-	'DISPLAY_POSTS'			=> 'Display posts from previous',
-	'DISPLAY_TOPICS'		=> 'Display topics from previous',
-	'DOWNLOADED'			=> 'Downloaded',
-	'DOWNLOADING_FILE'		=> 'Downloading file',
-	'DOWNLOAD_COUNTS'		=> array(
+	'DAY'						=> 'Day',
+	'DAYS'						=> 'Days',
+	'DELETE'					=> 'Delete',
+	'DELETE_ALL'				=> 'Delete all',
+	'DELETE_COOKIES'			=> 'Delete cookies',
+	'DELETE_MARKED'				=> 'Delete marked',
+	'DELETE_POST'				=> 'Delete post',
+	'DELIMITER'					=> 'Delimiter',
+	'DESCENDING'				=> 'Descending',
+	'DISABLED'					=> 'Disabled',
+	'DISPLAY'					=> 'Display',
+	'DISPLAY_GUESTS'			=> 'Display guests',
+	'DISPLAY_MESSAGES'			=> 'Display messages from previous',
+	'DISPLAY_POSTS'				=> 'Display posts from previous',
+	'DISPLAY_TOPICS'			=> 'Display topics from previous',
+	'DOMAIN_NO_MX_RECORD_EMAIL'	=> 'The entered email domain has no valid MX record.',
+	'DOWNLOADED'				=> 'Downloaded',
+	'DOWNLOADING_FILE'			=> 'Downloading file',
+	'DOWNLOAD_COUNTS'			=> array(
 		0	=> 'Not downloaded yet',
 		1	=> 'Downloaded %d time',
 		2	=> 'Downloaded %d times',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 8549230b9f..676e9bf986 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -179,7 +179,6 @@ $lang = array_merge($lang, array(
 	'DEMOTE_SELECTED'			=> 'Demote selected',
 	'DISABLE_CENSORS'			=> 'Enable word censoring',
 	'DISPLAY_GALLERY'			=> 'Display gallery',
-	'DOMAIN_NO_MX_RECORD_EMAIL'	=> 'The entered email domain has no valid MX record.',
 	'DOWNLOADS'					=> 'Downloads',
 	'DRAFTS_DELETED'			=> 'All selected drafts were successfully deleted.',
 	'DRAFTS_EXPLAIN'			=> 'Here you can view, edit and delete your saved drafts.',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 4065c54d39..1343bd7c60 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -894,8 +894,6 @@ switch ($mode)
 			trigger_error('NO_EMAIL');
 		}
 
-		$user->add_lang('ucp');
-
 		/** @var $form \phpbb\message\form */
 		$form = $phpbb_container->get('message.form.' . $form_name);