Merge remote branch 'upstream/master'

[friendica.git] / include / network.php

diff --git a/include/network.php b/include/network.php
index d69454899a7438673d301c552644fc273aae54e3..a95dde535c9fa967156b28806f9c508b9ed1b064 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -605,6 +605,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);