friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Order for allow/disallow has been changed

pull/13920/head
Michael 2024-02-19 05:50:35 +00:00
parent ab914561ef
commit 0231fbea8b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Util/Network.php
View File

@ -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;
}
/**