Fixes for TICs for nodelists

This commit is contained in:
Deon George 2023-11-22 16:41:14 +11:00
parent fcc2c23894
commit 5f11f81be3
2 changed files with 2 additions and 2 deletions

View File

@ -140,7 +140,7 @@ class Tic extends FTNBase
$this->file->name, $this->file->name,
)); ));
return (($this->file->nodelist_filearea_id === $this->file->filearea->domain->filearea_id) return (($this->file->nodelist_filearea_id === $this->file->filearea->domain->filearea_id)
&& (preg_match(str_replace(['.','?'],['\.','.'],'#^'.$this->file->filearea->domain->nodelist_filename.'$#i'),$this->file->name))); && (preg_match(str_replace(['.','?'],['\.','[0-9]'],'#^'.$this->file->filearea->domain->nodelist_filename.'$#i'),$this->file->name)));
} }
/** /**

View File

@ -99,6 +99,6 @@ class TicProcess implements ShouldQueue
} }
if ($to->isNodelist()) if ($to->isNodelist())
NodelistImport::dispatch($to->fo,$this->domain); NodelistImport::dispatch($fo,$this->domain);
} }
} }