RetailCRM-Mirror/mailgun-php
1
0
Fork 0
mirror of https://github.com/retailcrm/mailgun-php.git synced 2024-11-26 06:46:08 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #56 from jchamberlain/master

Browse Source 
Don't require @ prefix for attachment filenames
This commit is contained in:
Travis Swientek 2014-11-17 17:28:32 -08:00
commit d744b0a809
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mailgun/Messages/MessageBuilder.php
View File

@ -169,26 +169,22 @@ class MessageBuilder
public function addAttachment($attachmentPath, $attachmentName = null) public function addAttachment($attachmentPath, $attachmentName = null)
{ {
if (preg_match("/^@/", $attachmentPath)) { if (isset($this->files["attachment"])) {
if (isset($this->files["attachment"])) { $attachment = array(
$attachment = array( 'filePath' => $attachmentPath,
'remoteName' => $attachmentName
);
array_push($this->files["attachment"], $attachment);
} else {
$this->files["attachment"] = array(
array(
'filePath' => $attachmentPath, 'filePath' => $attachmentPath,
'remoteName' => $attachmentName 'remoteName' => $attachmentName
); )
array_push($this->files["attachment"], $attachment); );
} else {
$this->files["attachment"] = array(
array(
'filePath' => $attachmentPath,
'remoteName' => $attachmentName
)
);
}
return true;
} else {
throw new InvalidParameter(INVALID_PARAMETER_ATTACHMENT);
} }
return true;
} }
public function addInlineImage($inlineImagePath, $inlineImageName = null) public function addInlineImage($inlineImagePath, $inlineImageName = null)