aboutsummaryrefslogtreecommitdiffstats
path: root/include/network.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2012-07-02 03:41:27 +0100
committerThomas Willingham <founder@kakste.com>2012-07-02 03:41:27 +0100
commit610c78f9e0da9700a3fa3563c560c5dc119aebb8 (patch)
treefeff690c73da49ec34f13bb6c933ee1be8a2c38a /include/network.php
parent74a819980fad6d79998a70b0f6be44803db7e0c7 (diff)
parentab2b3304dc7c30f65297d398661b1eccb2723685 (diff)
downloadvolse-hubzilla-610c78f9e0da9700a3fa3563c560c5dc119aebb8.tar.gz
volse-hubzilla-610c78f9e0da9700a3fa3563c560c5dc119aebb8.tar.bz2
volse-hubzilla-610c78f9e0da9700a3fa3563c560c5dc119aebb8.zip
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'include/network.php')
-rw-r--r--include/network.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/network.php b/include/network.php
index c1a76000e..9e6f8355b 100644
--- a/include/network.php
+++ b/include/network.php
@@ -607,6 +607,9 @@ function validate_url(&$url) {
if(! function_exists('validate_email')) {
function validate_email($addr) {
+ if(get_config('system','disable_email_validation'))
+ return true;
+
if(! strpos($addr,'@'))
return false;
$h = substr($addr,strpos($addr,'@') + 1);