diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-08 20:02:52 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-08 20:02:52 -0800 |
| commit | 00132cd977ee74550b100836aa16e936bc1a90b5 (patch) | |
| tree | 528e17070f2a1303a0482c0b44e8d9c769284a8c /include | |
| parent | 5e1b61eb02272698023204a29c1d96e5350f4ceb (diff) | |
| parent | dfb49558f470f94300e6f97b47d1c9c4f0e6b580 (diff) | |
| download | volse-hubzilla-00132cd977ee74550b100836aa16e936bc1a90b5.tar.gz volse-hubzilla-00132cd977ee74550b100836aa16e936bc1a90b5.tar.bz2 volse-hubzilla-00132cd977ee74550b100836aa16e936bc1a90b5.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/text.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/text.php b/include/text.php index c2573da0c..edaa8dcd3 100644 --- a/include/text.php +++ b/include/text.php @@ -872,15 +872,17 @@ function searchbox($s,$id='search-box',$url='/search',$save = false) { )); } +function valid_email_regex($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; +} function valid_email($x){ if(get_config('system','disable_email_validation')) return true; - if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) - return true; - - return false; + return valid_email_regex($x); } /** |