From 19000f27b901ed787e2130239ad2bc97b8cca7ac Mon Sep 17 00:00:00 2001
From: yehudah <yehudah@b8457f37-d9ea-0310-8a92-e5e31aec5664>
Date: Mon, 23 Jul 2018 15:13:28 +0000
Subject: Removed deprecated functions from 7.2 + comment unready feature

git-svn-id: https://plugins.svn.wordpress.org/post-smtp/trunk@1913616 b8457f37-d9ea-0310-8a92-e5e31aec5664
---
 Postman/Postman-Configuration/PostmanSmtpDiscovery.php | 4 ++--
 Postman/Postman-Mail/PostmanMessage.php                | 2 +-
 Postman/Postman.php                                    | 1 -
 Postman/PostmanWpMail.php                              | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'Postman')

diff --git a/Postman/Postman-Configuration/PostmanSmtpDiscovery.php b/Postman/Postman-Configuration/PostmanSmtpDiscovery.php
index 60728c6..2d568cd 100644
--- a/Postman/Postman-Configuration/PostmanSmtpDiscovery.php
+++ b/Postman/Postman-Configuration/PostmanSmtpDiscovery.php
@@ -84,7 +84,7 @@ if (! class_exists ( 'PostmanSmtpMappings' )) {
 		);
 		public static function getSmtpFromEmail($hostname) {
 			reset ( PostmanSmtpMappings::$emailDomain );
-			while ( list ( $domain, $smtp ) = each ( PostmanSmtpMappings::$emailDomain ) ) {
+			foreach ( PostmanSmtpMappings::$emailDomain as $domain => $smtp ) {
 				if (strcasecmp ( $hostname, $domain ) == 0) {
 					return $smtp;
 				}
@@ -93,7 +93,7 @@ if (! class_exists ( 'PostmanSmtpMappings' )) {
 		}
 		public static function getSmtpFromMx($mx) {
 			reset ( PostmanSmtpMappings::$mxMappings );
-			while ( list ( $domain, $smtp ) = each ( PostmanSmtpMappings::$mxMappings ) ) {
+            foreach ( PostmanSmtpMappings::$mxMappings as $domain => $smtp ) {
 				if (PostmanUtils::endswith ( $mx, $domain )) {
 					return $smtp;
 				}
diff --git a/Postman/Postman-Mail/PostmanMessage.php b/Postman/Postman-Mail/PostmanMessage.php
index 5280060..a85687e 100644
--- a/Postman/Postman-Mail/PostmanMessage.php
+++ b/Postman/Postman-Mail/PostmanMessage.php
@@ -61,7 +61,7 @@ if ( ! class_exists( 'PostmanMessage' ) ) {
 
 		function __call($name, $args) {
 			$class = new ReflectionClass(__CLASS__);
-			$methods = $class->getMethods(ReflectionMethod::IS_PUBLIC);
+			$methods = $class->getMethods(ReflectionMethod::IS_PUBLIC );
 
 			$message = __( '<code>%1$s</code> method of a <code>PostmanMessage</code> object is <strong>not supported</strong>. Use one of the following methods <pre><code>%2$s</code></pre>', Postman::TEXT_DOMAIN );
 
diff --git a/Postman/Postman.php b/Postman/Postman.php
index ba639e3..ad86b57 100644
--- a/Postman/Postman.php
+++ b/Postman/Postman.php
@@ -470,4 +470,3 @@ if ( ! function_exists( 'str_getcsv' ) ) {
 		return PostmanUtils::postman_strgetcsv_impl( $string );
 	}
 }
-
diff --git a/Postman/PostmanWpMail.php b/Postman/PostmanWpMail.php
index eadfe60..f5fcf7f 100644
--- a/Postman/PostmanWpMail.php
+++ b/Postman/PostmanWpMail.php
@@ -166,7 +166,7 @@ if ( ! class_exists( 'PostmanWpMail' ) ) {
 			// apply the WordPress filters
 			// may impact the from address, from email, charset and content-type
 			$message->applyFilters();
-			do_action_ref_array( 'phpmailer_init', array( &$message ) );
+			//do_action_ref_array( 'phpmailer_init', array( &$message ) );
 
 			// create the body parts (if they are both missing)
 			if ( $message->isBodyPartsEmpty() ) {
-- 
cgit v1.2.3