Merge branch 'release/1.8.9.2'

inboundnow · May 18, 2018 · c25aeb7 · c25aeb7
2 parents 32ecb13 + 0e9ea92
commit c25aeb7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/classes/admin/report-templates/report.email-stats.php b/classes/admin/report-templates/report.email-stats.php
@@ -298,11 +298,7 @@ public static function display_all_events(){
                                     $lead_first_name = get_post_meta($lead->ID, 'wpleads_first_name', true);
                                     $lead_last_name = get_post_meta($lead->ID, 'wpleads_last_name', true);
 
-                                    $lead_name = $lead_first_name . ' ' . $lead_last_name;
-
-                                    if(empty(trim($lead_name))){
-                                        $lead_name = 'N/A';
-                                    }
+                                    $lead_name = trim($lead_first_name . ' ' . $lead_last_name);
 
                                 }else{
                                     $lead_name = __('Lead Deleted', 'inbound-pro');

diff --git a/core/cta/classes/class.cta.render.php b/core/cta/classes/class.cta.render.php
@@ -501,7 +501,8 @@ public function enqueue_scripts() {
                 $global_cookie = get_option( 'wp-cta-main-global-cookie', 0 );
                 $global_cookie_length = get_option( 'wp-cta-main-global-cookie-length', 30 );
 
-                $popup_params = array(	'timeout' => $pop_time_final,
+                $popup_params = array(
+                    'timeout' => $pop_time_final,
                     'c_status' => $popup_cookie,
                     'c_length' => $popup_cookie_length,
                     'page_views'=> $popup_pageviews,

diff --git a/core/mailer/classes/class.mailer.php b/core/mailer/classes/class.mailer.php
@@ -603,7 +603,13 @@ public static function get_variation_from_email() {
      *    Gets the reply email from variation settings
      */
     public static function get_variation_reply_email() {
-        return self::$email_settings['variations'] [self::$row->variation_id] ['reply_email'];
+        /* process tokens */
+        self::$email_settings['variations'][self::$row->variation_id]['reply_email'] = Inbound_Mailer_Tokens::process_tokens(
+            self::$email_settings['variations'][self::$row->variation_id]['reply_email'] ,
+            json_decode(self::$row->tokens , true)
+        );
+
+        return do_shortcode(self::$email_settings['variations'][self::$row->variation_id]['reply_email']);
     }
 
 

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.9.1
+Version: 1.8.9.2
 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.9.1' );
+			define('INBOUND_PRO_CURRENT_VERSION', '1.8.9.2' );
 			define('INBOUND_PRO_STABLE_VERSION', '1.8.6.7' );
 			define('INBOUND_PRO_TRANSLATIONS_VERSION', '1.30.18' );
 			define('INBOUND_PRO_URLPATH', plugin_dir_url( __FILE__ ));