Merge branch 'release/1.9.5.10'

inboundnow · Jan 7, 2019 · 628d15f · 628d15f
2 parents bba840e + 4fb5e43
commit 628d15f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/core/mailer/classes/class.metaboxes.inbound-email.php b/core/mailer/classes/class.metaboxes.inbound-email.php
@@ -1574,8 +1574,8 @@ public static function  correct_datetime_errors( $schedule_date , $wordpress_dat
                 /* reformat Datetime Pattern if leading with F */
                 if ($wordpress_date_time_format[0]  == "F") {
 
-                    $new = new DateTime($schedule_date->format( "d/m/Y G:i"));
-                    $corrected['meta'] = $schedule_date->format( "d/m/Y G:i");
+                    $new = new DateTime($schedule_date->format( "m/d G:i"));
+                    $corrected['meta'] = $schedule_date->format( "m/d/Y G:i");
                     $corrected['object'] = $new;
                     return $corrected;
                 }
@@ -1694,7 +1694,13 @@ public static function print_js_listeners() {
             }
 
             global $post;
-            $post->ID = (isset($_GET['post'])) ? (int) $_GET['post'] : $post->ID; /* conflict fix */
+
+            /* conflict fix */
+            $post_id_check =  (int) $_GET['post'];
+            if ($post->ID != $post_id_check) {
+                $post = get_post($post_id_check);
+            }
+
 
             /* Load Settings JS Class */
             self::print_settings_class_JS();
@@ -1858,7 +1864,6 @@ public static function print_settings_class_JS() {
                          *    Changes UI based on current post status
                          */
                         toggle_post_status: function (post_status) {
-                            jQuery('#email-status-display').text(post_status);
 
                             switch (post_status) {
                                 case 'sent':
@@ -2095,9 +2100,6 @@ public static function print_settings_class_JS() {
                                 case 'automated':
                                     Settings.toggle_post_status('automated');
                                     break;
-                                default:
-                                    Settings.toggle_post_status('unsent');
-                                    break;
                             }
                         },
                         /**

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.5.9
+Version: 1.9.5.10
 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.5.9' );
+			define('INBOUND_PRO_CURRENT_VERSION', '1.9.5.10' );
 			define('INBOUND_PRO_STABLE_VERSION', '1.9.5.6' );
 			define('INBOUND_PRO_TRANSLATIONS_VERSION', '1.30.22' );
 			define('INBOUND_PRO_URLPATH', plugin_dir_url( __FILE__ ));