diff --git a/core/landing-pages/classes/class.settings.php b/core/landing-pages/classes/class.settings.php index a96a0557..bb87b853 100644 --- a/core/landing-pages/classes/class.settings.php +++ b/core/landing-pages/classes/class.settings.php @@ -752,7 +752,7 @@ public static function render_stand_alone_settings($key, $custom_fields, $active case 'inboundnow-license-key': if (defined('INBOUND_PRO_PATH')) { - continue; + continue 2; } if ($master_license_key) { diff --git a/core/landing-pages/landing-pages.php b/core/landing-pages/landing-pages.php index 658be9a9..f3574e0c 100644 --- a/core/landing-pages/landing-pages.php +++ b/core/landing-pages/landing-pages.php @@ -3,7 +3,7 @@ Plugin Name: Landing Pages Plugin URI: http://www.inboundnow.com/landing-pages/ Description: Landing page template framework with variant testing and lead capturing through cooperation with Inbound Now's Leads plugin. This is the stand alone version served through WordPress.org. -Version: 2.7.7 +Version: 2.7.9 Author: Inbound Now Author URI: https://www.inboundnow.com/?innercity=true Text Domain: inbound-pro @@ -42,7 +42,7 @@ public function __construct() { */ private static function load_constants() { - define('LANDINGPAGES_CURRENT_VERSION', '2.7.7' ); + define('LANDINGPAGES_CURRENT_VERSION', '2.7.9' ); define('LANDINGPAGES_URLPATH', plugins_url( '/' , __FILE__ ) ); define('LANDINGPAGES_PATH', WP_PLUGIN_DIR.'/'.plugin_basename( dirname(__FILE__) ).'/' ); define('LANDINGPAGES_PLUGIN_SLUG', 'landing-pages' ); diff --git a/core/mailer/classes/class.mailer.wpmail.php b/core/mailer/classes/class.mailer.wpmail.php index e31333dd..9b24c447 100644 --- a/core/mailer/classes/class.mailer.wpmail.php +++ b/core/mailer/classes/class.mailer.wpmail.php @@ -19,7 +19,7 @@ public static function send_email() { $body = self::generate_tracking_pixel($body); $headers = array(); $headers[] = 'Content-Type: text/html; charset=UTF-8'; - $headers[] = 'From: '.self::$email['from_name'].'<'.self::$email['from_email'].'>'; + $headers[] = 'From: '.self::$email['from_name'].' <'.self::$email['from_email'].'>'; $headers[] = 'Reply-To: '.self::$email['reply_email'].''; diff --git a/core/mailer/classes/class.statistics.sparkpost.php b/core/mailer/classes/class.statistics.sparkpost.php index 657baab8..e8e7ffa4 100644 --- a/core/mailer/classes/class.statistics.sparkpost.php +++ b/core/mailer/classes/class.statistics.sparkpost.php @@ -88,6 +88,9 @@ public static function get_sparkpost_inbound_events( $email_id , $variation_id = return array(); } + /* prepare date range */ + self::prepare_date_range(); + /* get email setup data */ $settings = Inbound_Email_Meta::get_settings($post->ID); $settings['send_datetime'] = (isset($settings['send_datetime'])) ? $settings['send_datetime'] : ''; diff --git a/core/mailer/classes/class.statistics.wpmail.php b/core/mailer/classes/class.statistics.wpmail.php index d13d842e..81768c12 100644 --- a/core/mailer/classes/class.statistics.wpmail.php +++ b/core/mailer/classes/class.statistics.wpmail.php @@ -83,6 +83,9 @@ public static function get_wpmail_inbound_events( $email_id , $variation_id = nu return array(); } + /* prepare date range */ + self::prepare_date_range(); + /* get email setup data */ $settings = Inbound_Email_Meta::get_settings($post->ID); $settings['send_datetime'] = (isset($settings['send_datetime'])) ? $settings['send_datetime'] : ''; diff --git a/inbound-pro.php b/inbound-pro.php index 0677e052..92fab26a 100644 --- 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.9.7.5 +Version: 1.9.9.7.6 Author URI: http://www.inboundnow.com/ Text Domain: inbound-pro */ @@ -95,8 +95,8 @@ public function __construct() { */ private static function define_constants() { - define('INBOUND_PRO_CURRENT_VERSION', '1.9.9.7.5' ); - define('INBOUND_PRO_STABLE_VERSION', '1.9.9.7.3' ); + define('INBOUND_PRO_CURRENT_VERSION', '1.9.9.7.6' ); + define('INBOUND_PRO_STABLE_VERSION', '1.9.9.7.6' ); define('INBOUND_PRO_TRANSLATIONS_VERSION', '1.30.22' ); define('INBOUND_PRO_URLPATH', plugin_dir_url( __FILE__ )); define('INBOUND_PRO_PATH', plugin_dir_path( __FILE__ ) );