Merge branch 'release/1.9.9.7.6'

inboundnow · Feb 26, 2020 · d9a6337 · d9a6337
2 parents 48118fc + 709d423
commit d9a6337
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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__ ) );