diff options
| -rw-r--r-- | Postman/Postman.php | 24 | ||||
| -rw-r--r-- | postman-smtp.php | 4 | ||||
| -rw-r--r-- | readme.txt | 5 |
3 files changed, 22 insertions, 11 deletions
diff --git a/Postman/Postman.php b/Postman/Postman.php index 8b83c38..7df883a 100644 --- a/Postman/Postman.php +++ b/Postman/Postman.php @@ -54,7 +54,7 @@ class Postman { require_once 'PostmanConfigTextHelper.php'; require_once 'Postman-Email-Log/PostmanEmailLogPostType.php'; require_once 'Postman-Mail/PostmanMyMailConnector.php'; - require_once 'Postman-Mail/PostmanWooCommerce.php'; + //require_once 'Postman-Mail/PostmanWooCommerce.php'; // get plugin metadata - alternative to get_plugin_data $this->pluginData = array( @@ -107,7 +107,7 @@ class Postman { new PostmanMyMailConnector( $rootPluginFilenameAndPath ); // WooCommerce Integration - new PostmanWoocommerce(); + //new PostmanWoocommerce(); // register the shortcode handler on the add_shortcode event add_shortcode( 'postman-version', array( @@ -121,12 +121,19 @@ class Postman { 'on_plugins_loaded', ) ); - $active_plugins = (array) get_option( 'active_plugins', array() ); - if ( in_array( 'sitepress-multilingual-cms/sitepress.php', $active_plugins ) && !get_option( 'postman_wpml_fixed' ) ) { - add_action( 'admin_notices', array( $this, 'post_smtp_wpml_admin_notice' ) ); + /** + * @todo: WPML say they fix the issue in version 3.9 + * https://wordpress.org/support/topic/error-in-pluggable-php173/#post-10021301 + */ + if ( get_option( 'icl_sitepress_version' ) && version_compare( get_option( 'icl_sitepress_version' ), '3.9', '<' ) ) { - // Temp: Just a quick solution, need to find a better option. - add_action( 'admin_init', array( $this, 'postman_fix_wpml' ) ); + $active_plugins = (array)get_option('active_plugins', array()); + if (in_array('sitepress-multilingual-cms/sitepress.php', $active_plugins) && !get_option('postman_wpml_fixed')) { + add_action('admin_notices', array($this, 'post_smtp_wpml_admin_notice')); + + // Temp: Just a quick solution, need to find a better option. + add_action('admin_init', array($this, 'postman_fix_wpml')); + } } // hook on the wp_loaded event @@ -151,7 +158,7 @@ class Postman { public function post_smtp_wpml_admin_notice() { $class = 'notice notice-error'; $title = __( 'Post SMTP notice!', Postman::TEXT_DOMAIN ); - $intro = __( 'WPML is installed and has a known bug with Post SMTP and few other plugins.', Postman::TEXT_DOMAIN ); + $intro = __( 'WPML is installed and has a known bug with Post SMTP and few other plugins - you better upgrade, but we can try to fix it.', Postman::TEXT_DOMAIN ); $text = __( 'Click here to fix', Postman::TEXT_DOMAIN ); $message = '<br><a href="' . esc_url( add_query_arg( 'action', 'postman_fix_wpml', get_permalink() ) ) . '">' . $text . '</a>'; @@ -458,3 +465,4 @@ if ( ! function_exists( 'str_getcsv' ) ) { return PostmanUtils::postman_strgetcsv_impl( $string ); } } + diff --git a/postman-smtp.php b/postman-smtp.php index 3b8e88f..29ea419 100644 --- a/postman-smtp.php +++ b/postman-smtp.php @@ -4,7 +4,7 @@ * Plugin Name: Post SMTP * Plugin URI: https://wordpress.org/plugins/post-smtp/ * Description: Email not reliable? Post SMTP is the first and only WordPress SMTP plugin to implement OAuth 2.0 for Gmail, Hotmail and Yahoo Mail. Setup is a breeze with the Configuration Wizard and integrated Port Tester. Enjoy worry-free delivery even if your password changes! - * Version: 1.8.4 + * Version: 1.8.5 * Author: Jason Hendriks, Yehuda Hassine * Text Domain: post-smtp * Author URI: https://postmansmtp.com @@ -99,5 +99,5 @@ function post_start( $startingMemory ) { */ function post_setupPostman() { require_once 'Postman/Postman.php'; - $kevinCostner = new Postman( __FILE__, '1.8.4' ); + $kevinCostner = new Postman( __FILE__, '1.8.5' ); } @@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=yehuda@m Tags: postman smtp, postman, smtp, email, mail, mailer, email log, oauth2, gmail, google apps, hotmail, yahoo, mandrill api, sendgrid api, elastic email, office365, mailgun Requires at least: 3.9 Tested up to: 4.9.5 -Stable tag: 1.8.4 +Stable tag: 1.8.5 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -12,6 +12,9 @@ Send, log and troubleshoot your Outgoing Email easily. Supports everything: SMTP == Description == += Version 1.8.5 released = +Making Post SMTP the best Gmail client for WordPress, and a notification feature for failed emails. [Read the detailes here](https://postmansmtp.com/post-smtp-1-8-4-best-wordpress-gmail-client/) + = WordPress Mail SMTP Plugin = = Postman SMTP is back! = |