Skip to content

Commit

Permalink
Merge pull request #93 from mailjet/development
Browse files Browse the repository at this point in the history
Updated tested up to WP version 4.9
  • Loading branch information
Ferhan Ismailov authored Nov 9, 2017
2 parents e7ecc6a + fb3d1e8 commit 46b4f99
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
Contributors: mailjet
Tags: email, marketing, signup, newsletter, widget, smtp, mailjet
Requires at least: 3.3.0
Tested up to: 4.8
Stable tag: 4.2.10
Tested up to: 4.9
Stable tag: 4.2.11
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -90,6 +90,9 @@ Need help? Our multilingual support team is here to answer your questions in any

== Changelog ==

= 4.2.11 =
* Updated 'Tested up to' version to include WordPress 4.9

= 4.2.10 =
* Translations update

Expand Down
2 changes: 1 addition & 1 deletion api/mailjet-api-v1.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function sendRequest($method = false, $params = array(), $request = 'GET'
curl_setopt($curl_handle, CURLOPT_USERPWD, $this->apiKey . ':' . $this->secretKey);
curl_setopt($curl_handle, CURLOPT_VERBOSE, true);
curl_setopt($curl_handle, CURLINFO_HEADER_OUT, true);
curl_setopt($curl_handle, CURLOPT_USERAGENT, 'wordpress-v1.4.2.10');
curl_setopt($curl_handle, CURLOPT_USERAGENT, 'wordpress-v1.4.2.11');

$this->_request_post = false;
if ($request == 'POST')
Expand Down
2 changes: 1 addition & 1 deletion api/mailjet-api-v3.php
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ private function sendRequest($object, $params, $method)
curl_setopt($this->_curl_handle, CURLOPT_SSL_VERIFYHOST, 2);
curl_setopt($this->_curl_handle, CURLOPT_USERPWD, $this->_apiKey.':'.$this->_secretKey);
curl_setopt($this->_curl_handle, CURLOPT_CUSTOMREQUEST, $method);
curl_setopt($this->_curl_handle, CURLOPT_USERAGENT, 'wordpress-4.2.10');
curl_setopt($this->_curl_handle, CURLOPT_USERAGENT, 'wordpress-4.2.11');

switch ($method) {
case 'GET' :
Expand Down
7 changes: 5 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
Contributors: mailjet
Tags: email, marketing, signup, newsletter, widget, smtp, mailjet
Requires at least: 3.3.0
Tested up to: 4.8
Stable tag: 4.2.10
Tested up to: 4.9
Stable tag: 4.2.11
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -90,6 +90,9 @@ Need help? Our multilingual support team is here to answer your questions in any

== Changelog ==

= 4.2.11 =
* Updated 'Tested up to' version to include WordPress 4.9

= 4.2.10 =
* Translations update

Expand Down
2 changes: 1 addition & 1 deletion wp-mailjet.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/*
Plugin Name: Mailjet for Wordpress
Version: 4.2.10
Version: 4.2.11
Plugin URI: https://www.mailjet.com/plugin/wordpress.htm
Description: Use mailjet SMTP to send email, manage lists and contacts within wordpress
Author: Mailjet SAS
Expand Down

0 comments on commit 46b4f99

Please sign in to comment.