Merge branch 'release/1.8.7.5'

inboundnow · Apr 3, 2018 · 9763782 · 9763782
2 parents bd490b9 + b8211d1
commit 9763782
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 21 deletions.
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.6.8
+Version: 2.6.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.6.8' );
+			define('LANDINGPAGES_CURRENT_VERSION', '2.6.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/shared/assets/js/frontend/analytics-src/analytics.page.js b/core/shared/assets/js/frontend/analytics-src/analytics.page.js
@@ -305,11 +305,13 @@ var _inboundPageTracking = (function(_inbound) {
 
             /* Let's try and fire this last - also defines what constitutes a bounce -  */
             var stored = false;
-            document.onreadystatechange = function () {
-                if (document.readyState !== 'loading' && stored === false) {
+            jQuery(document).ready(function() {
+
+                if (stored === false) {
                     _inbound.PageTracking.storePageView();
                 }
-            }
+
+            });
         }
         ,
         CheckTimeOut: function() {

diff --git a/core/shared/assets/js/frontend/analytics/inboundAnalytics.js b/core/shared/assets/js/frontend/analytics/inboundAnalytics.js
@@ -1,4 +1,4 @@
-/*! Inbound Analyticsv1.0.0 | (c) 2017 Inbound Now | https://github.com/inboundnow/cta */
+/*! Inbound Analyticsv1.0.0 | (c) 2018 Inbound Now | https://github.com/inboundnow/cta */
 /**
  * # _inbound
  *
@@ -3750,11 +3750,13 @@ var _inboundPageTracking = (function(_inbound) {
 
             /* Let's try and fire this last - also defines what constitutes a bounce -  */
             var stored = false;
-            document.onreadystatechange = function () {
-                if (document.readyState !== 'loading' && stored === false) {
+            jQuery(document).ready(function() {
+
+                if (stored === false) {
                     _inbound.PageTracking.storePageView();
                 }
-            }
+
+            });
         }
         ,
         CheckTimeOut: function() {

diff --git a/core/shared/assets/js/frontend/analytics/inboundAnalytics.min.js b/core/shared/assets/js/frontend/analytics/inboundAnalytics.min.js
diff --git a/core/shared/classes/class.ajax.php b/core/shared/classes/class.ajax.php
@@ -76,14 +76,12 @@ public static function track_lead() {
 			/* record CTA impressions */
 			$cta_impressions = ( isset($_POST['cta_impressions']) ) ? json_decode(stripslashes($_POST['cta_impressions']),true) : array();
 
-			if (!is_array($cta_impressions)) {
-				error_log('Bad CTA Impression Object');
-				return;
-			}
-			foreach ( $cta_impressions as $cta_id => $vid ) {
-				$lead_data['cta_id'] = (int) $cta_id;
-				$lead_data['variation_id'] = (int) $vid;
-				do_action('wp_cta_record_impression', $lead_data );
+			if (is_array($cta_impressions)) {
+				foreach ( $cta_impressions as $cta_id => $vid ) {
+					$lead_data['cta_id'] = (int) $cta_id;
+					$lead_data['variation_id'] = (int) $vid;
+					do_action('wp_cta_record_impression', $lead_data );
+				}
 			}
 
 			/* update content data */

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.8.7.4
+Version: 1.8.7.5
 Author URI: http://www.inboundnow.com/
 Text Domain: inbound-pro
 
@@ -96,7 +96,7 @@ public function __construct() {
 		*/
 		private static function define_constants() {
 
-			define('INBOUND_PRO_CURRENT_VERSION', '1.8.7.4' );
+			define('INBOUND_PRO_CURRENT_VERSION', '1.8.7.5' );
 			define('INBOUND_PRO_STABLE_VERSION', '1.8.6.7' );
 			define('INBOUND_PRO_TRANSLATIONS_VERSION', '1.30.17' );
 			define('INBOUND_PRO_URLPATH', plugin_dir_url( __FILE__ ));