Merge branch 'release/1.9.4.11'

inboundnow · Nov 21, 2018 · 8603212 · 8603212
2 parents 01a8511 + e6b6be3
commit 8603212
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 9 deletions.
diff --git a/core/mailer/classes/class.metaboxes.inbound-email.php b/core/mailer/classes/class.metaboxes.inbound-email.php
@@ -1381,10 +1381,16 @@ public static function render_settings($settings_key, $custom_fields, $post) {
                         if ($meta) {
                             /* get date time format as set by WordPress */
 
-                            $wordpress_date_time_format = (get_option('date_format') == 'd/m/Y') ?  'd/m/Y G:i' : 'm/d/Y G:i';
+                            /* get correct format - d/m/Y date formats will fatal */
+                            $wordpress_date_time_format = get_option('date_format') .' G:i';
 
+                            /* add date if does not exist */
                             $schedule_date = DateTime::createFromFormat(trim($wordpress_date_time_format) , trim($meta));
 
+                            if (!$schedule_date) {
+                                $schedule_date = new DateTime(date_i18n($wordpress_date_time_format));
+                            }
+
                             $meta_current_date_corrected = date_i18n('Y-m-d G:i');
                             $meta_schedule_corrected = $schedule_date->format('Y/m/d G:i');
 

diff --git a/core/mailer/classes/class.post-type.inbound-email.php b/core/mailer/classes/class.post-type.inbound-email.php
@@ -335,12 +335,12 @@ public static function check_if_scheduled_emails_sent() {
 				return;
 			}
 
-			/* get wordpress date format */
-			$wordpress_date_time_format = (get_option('date_format') == 'd/m/Y') ?  'd/m/Y G:i' : 'm/d/Y G:i';
+			/* get correct format - d/m/Y date formats will fatal */
+			$wordpress_date_time_format = get_option('date_format') .' G:i';
 
 			/* add date if does not exist */
 			if(!$settings['send_datetime']) {
-				$settings['send_datetime'] = date_i18n($wordpress_date_time_format);
+				$settings['send_datetime'] = date_i18n('m/d/Y G:i');
 			}
 
 			/* add time if does not exist */
@@ -357,6 +357,19 @@ public static function check_if_scheduled_emails_sent() {
 
 				/* make sure the schedule date is formatted correctly */
 				$date = DateTime::createFromFormat(trim($wordpress_date_time_format) , trim($settings['send_datetime']));
+
+				if (!$date) {
+					$date = new DateTime(date_i18n($wordpress_date_time_format));
+				}
+				/**
+				echo $wordpress_date_time_format;
+				echo "<br>";
+				echo $settings['send_datetime'];
+				echo "<br>";
+				//print_r($settings);
+				var_dump(DateTime::getLastErrors());
+				/**/
+
 				$schedule_date = new DateTime($date->format('Y-m-d G:i:s'));
 
 				$interval = $today->diff($schedule_date);

diff --git a/core/mailer/classes/class.scheduling.php b/core/mailer/classes/class.scheduling.php
@@ -162,12 +162,19 @@ public static function get_timestamp() {
 
         /* get date time format as set by WordPress */
 
-        $wordpress_date_time_format = (get_option('date_format') == 'd/m/Y') ?  'd/m/Y G:i' : 'm/d/Y G:i';
+        /* get correct format - d/m/Y date formats will fatal */
+        $wordpress_date_time_format = get_option('date_format') .' G:i';
+
+        /* add date if does not exist */
+        if(!$settings['send_datetime']) {
+            $settings['send_datetime'] = date_i18n('m/d/Y G:i');
+        }
 
         /* add time if does not exist */
         if(!strstr($settings['send_datetime'],':')) {
             $settings['send_datetime'] = $settings['send_datetime'] . " 00:00";
         }
+
         date_default_timezone_set($timezone);
 
         /*

diff --git a/core/mailer/classes/class.statistics.sparkpost.php b/core/mailer/classes/class.statistics.sparkpost.php
@@ -117,11 +117,11 @@ public static function get_sparkpost_inbound_events( $email_id , $variation_id =
         $today = new DateTime($wordpress_date_time);
 
         /* get correct format - d/m/Y date formats will fatal */
-        $wordpress_date_time_format = (get_option('date_format') == 'd/m/Y') ?  'd/m/Y G:i' : 'm/d/Y G:i';
+        $wordpress_date_time_format = get_option('date_format') .' G:i';
 
         /* add date if does not exist */
         if(!$settings['send_datetime']) {
-            $settings['send_datetime'] = date_i18n($wordpress_date_time_format);
+            $settings['send_datetime'] = date_i18n('m/d/Y G:i');
         }
 
         /* add time if does not exist */
@@ -130,6 +130,12 @@ public static function get_sparkpost_inbound_events( $email_id , $variation_id =
         }
 
         $date = DateTime::createFromFormat(trim($wordpress_date_time_format) , trim($settings['send_datetime']));
+
+        /* if the date object is bad then prevent fatal */
+        if (!$date) {
+            $date = new DateTime(date_i18n($wordpress_date_time_format));
+        }
+
         /**
         echo $wordpress_date_time_format;
         echo "<br>";

diff --git a/inbound-pro.php b/inbound-pro.php
@@ -4,7 +4,7 @@
 Plugin URI: http://www.inboundnow.com/
 Description: Professional Inbound Marketing Suite for WordPress
 Author: InboundWP LLC
-Version: 1.9.4.10
+Version: 1.9.4.11
 Author URI: http://www.inboundnow.com/
 Text Domain: inbound-pro
 */
@@ -95,7 +95,7 @@ public function __construct() {
 		*/
 		private static function define_constants() {
 
-			define('INBOUND_PRO_CURRENT_VERSION', '1.9.4.10' );
+			define('INBOUND_PRO_CURRENT_VERSION', '1.9.4.11' );
 			define('INBOUND_PRO_STABLE_VERSION', '1.9.4.5' );
 			define('INBOUND_PRO_TRANSLATIONS_VERSION', '1.30.22' );
 			define('INBOUND_PRO_URLPATH', plugin_dir_url( __FILE__ ));