Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bert Oost committed Apr 15, 2019
2 parents ea92c4a + a5527a6 commit 45a75bd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Craft CMS 3 - Mailjet mailer adapter

## v1.1.2 - 2019-04-15

### Changed

- Fixed connecting to the Mailjet API by removing client options from mail adapter

## v1.1.1 - 2019-04-14

### Changed
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "bertoost/craft-mailjet",
"description": "Craft 3 CMS plugin for adding Mailjet mail adapter.",
"type": "craft-plugin",
"version": "1.1.1",
"version": "1.1.2",
"keywords": [
"craft",
"craftcms",
Expand Down
5 changes: 1 addition & 4 deletions src/adapters/MailjetAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ public function getSettingsHtml()
*/
public function defineTransport()
{
$clientOptions = ['url' => 'api.mailjet.com', 'version' => 'v3.1', 'call' => true];

return [
'class' => MailjetTransport::class,
'constructArgs' => [
Expand All @@ -95,8 +93,7 @@ public function defineTransport()
],
Craft::parseEnv($this->apiKey),
Craft::parseEnv($this->apiSecret),
true,
$clientOptions
true
],
];
}
Expand Down

0 comments on commit 45a75bd

Please sign in to comment.