More work to ensure messages from a node are valid for the domain, and fix domain flatten to check for zone if one is supplied

This commit is contained in:
2023-09-17 15:46:09 +10:00
parent e611dcbe11
commit cc04ddd7b3
2 changed files with 20 additions and 6 deletions

View File

@@ -530,7 +530,7 @@ class Address extends Model
$do = $zo?->domain;
}
if ($do && $do->flatten)
if ($do && $do->flatten && (($ftn['z'] === 0) || $do->zones->pluck('zone_id')->contains($ftn['z'])))
$o = self::findZone($do,$ftn['n'],$ftn['f'],$ftn['p'],$trashed);
}