Merge pull request #1216 from agafonec/4.4.1

4.4.1

Author: ryanhungate

admin/v2/templates/confirmation/tabs/store-info.php

@@ -29,7 +29,7 @@
     $opt_in_settings = apply_filters('mailchimp_checkout_opt_in_options', $default_opt_in_settings);;
 ?>
 <input type="hidden" name="mailchimp_active_settings_tab" value="<?php echo MC_WC_STORE_INFO_TAB; ?>"/>
-<input type="hidden" value="<?php echo ( esc_html( isset( $current_currency_data ) ? $current_currency . ' | ' . $current_currency_data['name'] : $current_currency ) ); ?>" disabled/>
+<input type="hidden" value="<?php echo ( esc_attr( isset( $current_currency_data ) ? $current_currency . ' | ' . $current_currency_data['name'] : $current_currency ) ); ?>" disabled/>
 	<input type="hidden" value="<?php echo esc_attr( mailchimp_get_timezone( true ) ); ?>" disabled/>
 <div class="mc-wc-tab-content-wrapper store-info">
     <div class="mc-wc-tab-content-box">

admin/v2/templates/connect-accounts/button-actions.php

@@ -20,7 +20,7 @@
         <?php endif; ?>
 	</div>
 
-	<input type="hidden" id="<?php echo esc_attr( $this->plugin_name ); ?>-mailchimp-api-key" name="<?php echo esc_attr( $this->plugin_name ); ?>[mailchimp_api_key]" value="<?php echo isset( $options['mailchimp_api_key'] ) ? esc_html( $options['mailchimp_api_key'] ) : ''; ?>" required/>
+	<input type="hidden" id="<?php echo esc_attr( $this->plugin_name ); ?>-mailchimp-api-key" name="<?php echo esc_attr( $this->plugin_name ); ?>[mailchimp_api_key]" value="<?php echo isset( $options['mailchimp_api_key'] ) ? esc_attr( $options['mailchimp_api_key'] ) : ''; ?>" required/>
     <?php if ($show_connection_messages) : ?>
 	<p id="mailchimp-oauth-waiting" class="oauth-description"><?php esc_html_e( 'Connecting. A new window will open with Mailchimp\'s OAuth service. Please log-in and we will take care of the rest.', 'mailchimp-for-woocommerce' ); ?></p>
 	<p id="mailchimp-oauth-error" class="oauth-description"><?php esc_html_e( 'Error, can\'t login.', 'mailchimp-for-woocommerce' ); ?></p>

admin/v2/templates/connect-accounts/create-account-popup.php

@@ -27,18 +27,18 @@
 			<div id="mc-woocommerce-create-account-step-1" class="mc-woocommerce-create-account-step mc-woocommerce-form-wrapper">
 				<fieldset>
 					<?php $user_id = get_current_user_id(); ?>
-					<input id="org" name="org" type="hidden" value="<?php echo esc_html( get_bloginfo( 'name' ) ); ?>">
+					<input id="org" name="org" type="hidden" value="<?php echo esc_attr( get_bloginfo( 'name' ) ); ?>">
 					<div class="box">
 						<label for="first_name">
 							<span> <?php esc_html_e( 'First name', 'mailchimp-for-woocommerce' ); ?></span>
 						</label>
-						<input required type="text" id="first_name" name="first_name" value="<?php echo esc_html( get_user_meta( $user_id, 'first_name', true ) ); ?>"/>
+						<input required type="text" id="first_name" name="first_name" value="<?php echo esc_attr( get_user_meta( $user_id, 'first_name', true ) ); ?>"/>
 					</div>
 					<div class="box">
 						<label for="last_name">
 							<span> <?php esc_html_e( 'Last name', 'mailchimp-for-woocommerce' ); ?></span>
 						</label>
-						<input required type="text" id="last_name" name="last_name" value="<?php echo esc_html( get_user_meta( $user_id, 'last_name', true ) ); ?>"/>
+						<input required type="text" id="last_name" name="last_name" value="<?php echo esc_attr( get_user_meta( $user_id, 'last_name', true ) ); ?>"/>
 					</div>
 					<div class="box">
 						<label for="email">

includes/api/class-mailchimp-woocommerce-transform-products.php

@@ -77,21 +77,26 @@ public function transform( $woo, $fallback_title = null ) {
 
 		$variants = $variant_posts ? array_merge( array( $woo ), $variant_posts ) : array( $woo );
 
-		$is_variant = count( $variants ) > 1;
-
 		$product = new MailChimp_WooCommerce_Product();
 
 		if ( class_exists( 'SitePress' ) && function_exists( 'wpml_switch_language_action' ) ) {
 			$get_language_args  = array( 'element_id' => $woo->get_id(), 'element_type' => 'product' );
 			$post_language_info = apply_filters( 'wpml_element_language_details', null, $get_language_args );
-			wpml_switch_language_action( $post_language_info->language_code );
+
+            if (!empty($post_language_info->language_code)) {
+                wpml_switch_language_action( $post_language_info->language_code );
+            }
 		}
 
 		$product->setId( $woo->get_id() );
 		$product->setHandle( urldecode($woo->get_slug() ) );
 		$product->setImageUrl( $this->getProductImage( $woo ) );
 		$product->setDescription( $woo->get_description() );
-		$product->setPublishedAtForeign( mailchimp_date_utc( $woo->get_date_created() ) );
+        if ($woo->get_date_created()) {
+            $product->setPublishedAtForeign( mailchimp_date_utc( $woo->get_date_created() ) );
+        } else {
+            mailchimp_debug('product.transform', 'failed to get created date', ['product' => $woo]);
+        }
 		$product->setTitle( $woo->get_title() );
 		$product->setUrl( urldecode( $woo->get_permalink() ) );
 

includes/processes/class-mailchimp-woocommerce-single-product.php

@@ -135,9 +135,6 @@ public function process()
             if( !($product_post = MailChimp_WooCommerce_HPOS::get_product($this->id)) ){
                 return false;
             }
-            /*if (!($product_post = get_post($this->id))) {
-                return false;
-            }*/
 
             try {
                 // pull the product from Mailchimp first to see what method we need to call next.

public/js/mailchimp-woocommerce-public.js

@@ -4,7 +4,7 @@ var mailchimp,
     mailchimp_username_email,
     mailchimp_registration_email,
     mailchimp_submitted_email = false,
-    mailchimpReady = function (a) { /in/.test(document.readyState) ? setTimeout("mailchimpReady(" + a + ")", 9) : a(); };
+    mailchimpReady = function (a) { /in/.test(document.readyState) ? setTimeout(()=>{mailchimpReady(a)}, 9) : a(); };
 
 function mailchimpGetCurrentUserByHash(a) {
     try {