From d2a15d9afe06509ff3e9fe5b6463800f66813783 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 24 Feb 2013 17:42:53 +0100
Subject: [PATCH] [ticket/10896] Add missing email validation lost in develop
 merge

Fix incomplete merge, by adding a piece of code moved to another file in
olympus back.

PHPBB3-10896
---
 phpBB/includes/functions_acp.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php
index 32fd76e74d..d6bd9e35dd 100644
--- a/phpBB/includes/functions_acp.php
+++ b/phpBB/includes/functions_acp.php
@@ -443,6 +443,13 @@ function validate_config_vars($config_vars, &$cfg_array, &$error)
 				}
 			break;
 
+			case 'email':
+				if (!preg_match('/^' . get_preg_expression('email') . '$/i', $cfg_array[$config_name]))
+				{
+					$error[] = $user->lang['EMAIL_INVALID_EMAIL'];
+				}
+			break;
+
 			// Absolute path
 			case 'script_path':
 				if (!$cfg_array[$config_name])