Mailgun for WordPress - Version 1.7.1

Version Description

(2019-02-07): = - Reinstall settings page for multisites.

Download this release

Release Info

Developer Mailgun
Plugin Icon 128x128 Mailgun for WordPress
Version 1.7.1
Comparing to
See all releases

Code changes from version 1.7 to 1.7.1

Files changed (5) hide show
  1. CHANGELOG.md +3 -0
  2. includes/admin.php +5 -17
  3. includes/options-page.php +3 -1
  4. mailgun.php +1 -1
  5. readme.txt +5 -2
CHANGELOG.md CHANGED
@@ -1,6 +1,9 @@
1
  Changelog
2
  =========
3
 
 
 
 
4
  1.7 (2019-01-21)
5
  - Remove settings page for multisites.
6
  - Simplify admin notifications.
1
  Changelog
2
  =========
3
 
4
+ 1.7.1 (2019-02-07)
5
+ - Reinstall settings page for multisites.
6
+
7
  1.7 (2019-01-21)
8
  - Remove settings page for multisites.
9
  - Simplify admin notifications.
includes/admin.php CHANGED
@@ -43,7 +43,7 @@
43
  // Activation hook
44
  register_activation_hook($this->plugin_file, array(&$this, 'init'));
45
 
46
- if( (!defined('MULTISITE') || !MULTISITE) && (!defined('MAILGUN_USEAPI') || !MAILGUN_USEAPI) ):
47
  // Hook into admin_init and register settings and potentially register an admin_notice
48
  add_action('admin_init', array(&$this, 'admin_init'));
49
 
@@ -327,28 +327,16 @@
327
  $apiKeyUndefined = ( !$this->get_option('apiKey') && ( !defined('MAILGUN_APIKEY') || !MAILGUN_APIKEY ));
328
  $apiActiveNotConfigured = ( $this->get_option('useAPI') === '1' && ( $apiRegionUndefined || $apiKeyUndefined ) );
329
 
330
- if ( $apiActiveNotConfigured || $smtpActiveNotConfigured ):
331
  ?>
332
  <div id='mailgun-warning' class='notice notice-warning is-dismissible'>
333
  <p>
334
  <?php
335
  printf(
336
- _e('Mailgun now supports multiple regions! The U.S. region will be used by default, but you can choose the EU region.',
337
- 'mailgun')
 
338
  );
339
-
340
- if ( (defined('MULTISITE') || MULTISITE) && (!defined('MAILGUN_REGION') || !MAILGUN_REGION) ):
341
- printf(
342
- __('You can configure your Mailgun settings in your wp-config.php.', 'mailgun')
343
- );
344
- endif;
345
-
346
- if( (!defined('MULTISITE') || !MULTISITE) && !$this->get_option('domain')):
347
- printf(
348
- __('You can configure your Mailgun settings in <a href="%1$s">here</a>', 'mailgun'),
349
- menu_page_url('mailgun', false)
350
- );
351
- endif;
352
  ?>
353
  </p>
354
  </div>
43
  // Activation hook
44
  register_activation_hook($this->plugin_file, array(&$this, 'init'));
45
 
46
+ if( !defined('MAILGUN_USEAPI') || !MAILGUN_USEAPI ):
47
  // Hook into admin_init and register settings and potentially register an admin_notice
48
  add_action('admin_init', array(&$this, 'admin_init'));
49
 
327
  $apiKeyUndefined = ( !$this->get_option('apiKey') && ( !defined('MAILGUN_APIKEY') || !MAILGUN_APIKEY ));
328
  $apiActiveNotConfigured = ( $this->get_option('useAPI') === '1' && ( $apiRegionUndefined || $apiKeyUndefined ) );
329
 
330
+ if ($apiActiveNotConfigured || $smtpActiveNotConfigured):
331
  ?>
332
  <div id='mailgun-warning' class='notice notice-warning is-dismissible'>
333
  <p>
334
  <?php
335
  printf(
336
+ __('Mailgun now supports multiple regions! The U.S. region will be used by default, but you can choose the EU region. You can configure your Mailgun settings in your wp-config.php file or <a href="%1$s">here</a>',
337
+ 'mailgun'),
338
+ menu_page_url('mailgun', false)
339
  );
 
 
 
 
 
 
 
 
 
 
 
 
 
340
  ?>
341
  </p>
342
  </div>
includes/options-page.php CHANGED
@@ -28,6 +28,7 @@
28
  </a>
29
  </span>
30
  <h2><?php _e('Mailgun', 'mailgun'); ?></h2>
 
31
  <p>
32
  <?php
33
  $url = 'https://www.mailgun.com';
@@ -44,6 +45,7 @@
44
  echo $link;
45
  ?>
46
  </p>
 
47
  <p>
48
  <?php
49
  $url = 'https://signup.mailgun.com/new/signup';
@@ -210,7 +212,7 @@
210
  $url = 'http://documentation.mailgun.com/user_manual.html#tracking-clicks';
211
  $link = sprintf(
212
  wp_kses(
213
- __('If enabled, Mailgun will and track links. <a href="%1$s" target="%2$s">Open Tracking Documentation</a>.', 'mailgun'),
214
  array('a' => array(
215
  'href' => array(),
216
  'target' => array()
28
  </a>
29
  </span>
30
  <h2><?php _e('Mailgun', 'mailgun'); ?></h2>
31
+
32
  <p>
33
  <?php
34
  $url = 'https://www.mailgun.com';
45
  echo $link;
46
  ?>
47
  </p>
48
+
49
  <p>
50
  <?php
51
  $url = 'https://signup.mailgun.com/new/signup';
212
  $url = 'http://documentation.mailgun.com/user_manual.html#tracking-clicks';
213
  $link = sprintf(
214
  wp_kses(
215
+ __('If enabled, Mailgun will track links. <a href="%1$s" target="%2$s">Open Tracking Documentation</a>.', 'mailgun'),
216
  array('a' => array(
217
  'href' => array(),
218
  'target' => array()
mailgun.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin Name: Mailgun
5
  * Plugin URI: http://wordpress.org/extend/plugins/mailgun/
6
  * Description: Mailgun integration for WordPress
7
- * Version: 1.7
8
  * Author: Mailgun
9
  * Author URI: http://www.mailgun.com/
10
  * License: GPLv2 or later
4
  * Plugin Name: Mailgun
5
  * Plugin URI: http://wordpress.org/extend/plugins/mailgun/
6
  * Description: Mailgun integration for WordPress
7
+ * Version: 1.7.1
8
  * Author: Mailgun
9
  * Author URI: http://www.mailgun.com/
10
  * License: GPLv2 or later
readme.txt CHANGED
@@ -4,8 +4,8 @@ Mailgun for WordPress
4
  Contributors: Mailgun, sivel, lookahead.io, m35dev
5
  Tags: mailgun, smtp, http, api, mail, email
6
  Requires at least: 3.3
7
- Tested up to: 5.0.2
8
- Stable tag: 1.7
9
  License: GPLv2 or later
10
 
11
 
@@ -129,6 +129,9 @@ MAILGUN_FROM_ADDRESS Type: string
129
 
130
  == Changelog ==
131
 
 
 
 
132
  = 1.7 (2019-01-21): =
133
  - Remove settings page for multisites.
134
  - Simplify admin notifications.
4
  Contributors: Mailgun, sivel, lookahead.io, m35dev
5
  Tags: mailgun, smtp, http, api, mail, email
6
  Requires at least: 3.3
7
+ Tested up to: 5.0.3
8
+ Stable tag: 1.7.1
9
  License: GPLv2 or later
10
 
11
 
129
 
130
  == Changelog ==
131
 
132
+ = 1.7.1 (2019-02-07): =
133
+ - Reinstall settings page for multisites.
134
+
135
  = 1.7 (2019-01-21): =
136
  - Remove settings page for multisites.
137
  - Simplify admin notifications.