Merge remote-tracking branch 'remotes/current/modules/rel_mod_pdfDocumentsFull' into dev_initial
# Conflicts: # Application/views/tpl/documents/inc/header.tpl # Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl # Application/views/tpl/documents/invoice/invoice.tpl # Modules/out/src/pdfStyling.css # metadata.php
This commit is contained in:
@ -207,10 +207,18 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
|
||||
{
|
||||
// forced filename from setFilename()
|
||||
if ($this->filename) {
|
||||
return $this->addFilenameExtension($this->filename);
|
||||
return $this->addFilenameExtension(
|
||||
$this->makeValidFileName(
|
||||
$this->filename
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
return $this->addFilenameExtension($this->getTypeForFilename());
|
||||
return $this->addFilenameExtension(
|
||||
$this->makeValidFileName(
|
||||
$this->getTypeForFilename()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Verwijs in nieuw issue
Block a user