From: friendica <info@friendica.com>
Date: Fri, 16 Dec 2011 22:06:50 +0000 (-0800)
Subject: bug 241 - valid emails may contain + on lhs
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=690b3f57b7869a0032993b0b93abe0fa292df44f;p=friendica.git

bug 241 - valid emails may contain + on lhs
---

diff --git a/boot.php b/boot.php
index f4da4a670f..c06f59be27 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1196' );
+define ( 'FRIENDICA_VERSION',      '2.3.1197' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1111      );
 
diff --git a/include/text.php b/include/text.php
index 04d5dfcedf..5e9c393362 100644
--- a/include/text.php
+++ b/include/text.php
@@ -635,7 +635,7 @@ function search($s,$id='search-box',$url='/search',$save = false) {
 
 if(! function_exists('valid_email')) {
 function valid_email($x){
-	if(preg_match('/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
+	if(preg_match('/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
 		return true;
 	return false;
 }}