mirror of
https://github.com/friendica/friendica
synced 2024-09-21 01:32:20 +02:00
Order for allow/disallow has been changed
This commit is contained in:
parent
ab914561ef
commit
0231fbea8b
|
@ -271,17 +271,17 @@ class Network
|
|||
return false;
|
||||
}
|
||||
|
||||
$allowed = DI::config()->get('system', 'allowed_email');
|
||||
if (!empty($allowed) && self::isDomainMatch($domain, explode(',', $allowed))) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$disallowed = DI::config()->get('system', 'disallowed_email');
|
||||
if (!empty($disallowed) && self::isDomainMatch($domain, explode(',', $disallowed))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$allowed = DI::config()->get('system', 'allowed_email');
|
||||
if (empty($allowed)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return self::isDomainMatch($domain, explode(',', $allowed));
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue