bug 241 - valid emails may contain + on lhs
This commit is contained in:
parent
efb9157490
commit
690b3f57b7
2
boot.php
2
boot.php
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
||||||
require_once('include/cache.php');
|
require_once('include/cache.php');
|
||||||
|
|
||||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_VERSION', '2.3.1196' );
|
define ( 'FRIENDICA_VERSION', '2.3.1197' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1111 );
|
define ( 'DB_UPDATE_VERSION', 1111 );
|
||||||
|
|
||||||
|
|
|
@ -635,7 +635,7 @@ function search($s,$id='search-box',$url='/search',$save = false) {
|
||||||
|
|
||||||
if(! function_exists('valid_email')) {
|
if(! function_exists('valid_email')) {
|
||||||
function valid_email($x){
|
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 true;
|
||||||
return false;
|
return false;
|
||||||
}}
|
}}
|
||||||
|
|
Loading…
Reference in a new issue