Skip to content

Commit

Permalink
Merge branch 'release/1.9.4.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
atwellpub committed Nov 21, 2018
2 parents 21cba59 + de3603b commit 01a8511
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions core/mailer/classes/class.post-type.inbound-email.php
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,11 @@ public static function check_if_scheduled_emails_sent() {
/* 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';

/* add date if does not exist */
if(!$settings['send_datetime']) {
$settings['send_datetime'] = date_i18n($wordpress_date_time_format);
}

/* add time if does not exist */
if(!strstr($settings['send_datetime'],':')) {
$settings['send_datetime'] = $settings['send_datetime'] . " 00:00";
Expand Down
4 changes: 2 additions & 2 deletions inbound-pro.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Plugin URI: http://www.inboundnow.com/
Description: Professional Inbound Marketing Suite for WordPress
Author: InboundWP LLC
Version: 1.9.4.9
Version: 1.9.4.10
Author URI: http://www.inboundnow.com/
Text Domain: inbound-pro
*/
Expand Down Expand Up @@ -95,7 +95,7 @@ public function __construct() {
*/
private static function define_constants() {

define('INBOUND_PRO_CURRENT_VERSION', '1.9.4.9' );
define('INBOUND_PRO_CURRENT_VERSION', '1.9.4.10' );
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__ ));
Expand Down

0 comments on commit 01a8511

Please sign in to comment.