tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-07-01 08:59:33 +02:00
Code Issues Projects Releases Wiki Activity

FIX Update email attachment API for recipients and improve if statement readability

Browse Source
This commit is contained in:
Robbie Averill 2018-01-25 11:24:36 +13:00
parent 5695c9585a
commit 515f1923ba
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/Control/UserDefinedFormController.php
View File

@ -7,7 +7,6 @@ use SilverStripe\Assets\File;
use SilverStripe\Assets\Upload; use SilverStripe\Assets\Upload;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\Control\Email\Email; use SilverStripe\Control\Email\Email;
use SilverStripe\Control\HTTP;
use SilverStripe\Control\HTTPResponse; use SilverStripe\Control\HTTPResponse;
use SilverStripe\Core\Manifest\ModuleLoader; use SilverStripe\Core\Manifest\ModuleLoader;
use SilverStripe\Forms\Form; use SilverStripe\Forms\Form;
@ -293,14 +292,15 @@ JS
if ($attachments) { if ($attachments) {
foreach ($attachments as $file) { foreach ($attachments as $file) {
if (!$file->ID != 0) { /** @var File $file */
if ((int) $file->ID === 0) {
continue; continue;
} }
$email->attachFile( $email->addAttachmentFromData(
$file->Filename, $file->getString(),
$file->Filename, $file->getFilename(),
HTTP::get_mime_type($file->Filename) $file->getMimeType()
); );
} }
} }