From b20544fd9a70b1ac1f20bc9c4212689c07a59f9b Mon Sep 17 00:00:00 2001
From: Alessandro Pagnin <alepane@gmail.com>
Date: Sat, 7 Jul 2012 19:48:11 +0300
Subject: [PATCH 1/4] Updated languages/woocommerce-it_IT.po (just one row)

---
 languages/woocommerce-it_IT.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages/woocommerce-it_IT.po b/languages/woocommerce-it_IT.po
index a09ce415cb6..ede8a1483c5 100644
--- a/languages/woocommerce-it_IT.po
+++ b/languages/woocommerce-it_IT.po
@@ -10555,7 +10555,7 @@ msgstr ""
 #@ woocommerce
 #: templates/single-product/add-to-cart/variable.php:43
 msgid "Clear selection"
-msgstr ""
+msgstr "Annulla selezione"
 
 #@ woocommerce
 #: templates/single-product/review.php:25

From 52fd982547393c77e98fccb6b0dc9fadd994f93f Mon Sep 17 00:00:00 2001
From: Coen Jacobs <coenjacobs@gmail.com>
Date: Mon, 9 Jul 2012 16:46:51 +0200
Subject: [PATCH 2/4] Colombia zipcodes are not required

---
 classes/class-wc-countries.php | 5 +++++
 readme.txt                     | 1 +
 2 files changed, 6 insertions(+)

diff --git a/classes/class-wc-countries.php b/classes/class-wc-countries.php
index 1c5ab797254..8829095487d 100644
--- a/classes/class-wc-countries.php
+++ b/classes/class-wc-countries.php
@@ -679,6 +679,11 @@ class WC_Countries {
 						'placeholder'	=> __('Province', 'woocommerce')
 					)
 				),
+				'CO' => array(
+					'postcode' => array(
+						'required' 	=> false
+					)
+				),
 				'CZ' => array(
 					'state'		=> array(
 						'required' => false
diff --git a/readme.txt b/readme.txt
index a5bd0526d8c..33bedec5846 100644
--- a/readme.txt
+++ b/readme.txt
@@ -166,6 +166,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 * Fix - Windows CRT fix
 * Fix - Order count clear transient on delete
 * Fix - When placing an order again, clear current cart.
+* Fix - Colombia zipcodes are not required
 
 = 1.5.8 - 21/06/2012 =
 * Tweak - Textarea for notes and enabled HTML

From 47b51a4ffb001ef72ea3b6eee39666e5ad72c2da Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Mon, 9 Jul 2012 17:50:21 +0100
Subject: [PATCH 3/4] Tweak to #1222. Closes #1218.

---
 readme.txt                     |  1 +
 woocommerce-core-functions.php | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/readme.txt b/readme.txt
index 33bedec5846..b316c118914 100644
--- a/readme.txt
+++ b/readme.txt
@@ -167,6 +167,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 * Fix - Order count clear transient on delete
 * Fix - When placing an order again, clear current cart.
 * Fix - Colombia zipcodes are not required
+* Fix - Conflict with WPML joins
 
 = 1.5.8 - 21/06/2012 =
 * Tweak - Textarea for notes and enabled HTML
diff --git a/woocommerce-core-functions.php b/woocommerce-core-functions.php
index cf940aa39b3..e41cdeee43e 100644
--- a/woocommerce-core-functions.php
+++ b/woocommerce-core-functions.php
@@ -602,11 +602,18 @@ add_action( 'comment_feed_where', 'woocommerce_exclude_order_comments_from_feed_
 function woocommerce_exclude_order_comments( $clauses ) {
 	global $wpdb, $typenow;
 	
-	if (is_admin() && $typenow=='shop_order') return $clauses; // Don't hide when viewing orders in admin
+	if ( is_admin() && $typenow == 'shop_order' ) 
+		return $clauses; // Don't hide when viewing orders in admin
 	
-	$clauses['join'] = "LEFT JOIN $wpdb->posts ON $wpdb->comments.comment_post_ID = $wpdb->posts.ID";
+	if ( ! $clauses['join'] )
+		$clauses['join'] = '';
 	
-	if ($clauses['where']) $clauses['where'] .= ' AND ';
+	$clauses['join'] .= " 
+		LEFT JOIN $wpdb->posts ON $wpdb->comments.comment_post_ID = $wpdb->posts.ID 
+	";
+	
+	if ( $clauses['where'] ) 
+		$clauses['where'] .= ' AND ';
 	
 	$clauses['where'] .= "
 		$wpdb->posts.post_type NOT IN ('shop_order')

From d6183d785383fd56a0d51be5bf205e066cb427f7 Mon Sep 17 00:00:00 2001
From: Mike Jolley <mike.jolley@me.com>
Date: Mon, 9 Jul 2012 18:12:24 +0100
Subject: [PATCH 4/4] IPN check. Closes #1215.

---
 admin/woocommerce-admin-status.php | 5 ++++-
 readme.txt                         | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin/woocommerce-admin-status.php b/admin/woocommerce-admin-status.php
index 5378bb9425c..a83536d4328 100644
--- a/admin/woocommerce-admin-status.php
+++ b/admin/woocommerce-admin-status.php
@@ -343,12 +343,15 @@ function woocommerce_status() {
             	
             	// WP Remote Post Check
 				$posting['wp_remote_post']['name'] = __('WP Remote Post Check','woocommerce');
+				$request['cmd'] = '_notify-validate';
 				$params = array( 
 					'sslverify' 	=> false,
 		        	'timeout' 		=> 60,
-		        	'user-agent'	=> 'WooCommerce/' . $woocommerce->version
+		        	'user-agent'	=> 'WooCommerce/' . $woocommerce->version,
+		        	'body'			=> $request
 				);	
 				$response = wp_remote_post( 'https://www.paypal.com/cgi-bin/webscr', $params );
+				
 				if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
             		$posting['wp_remote_post']['note'] = __('wp_remote_post() was successful - PayPal IPN is working.', 'woocommerce'); 
             		$posting['wp_remote_post']['success'] = true;
diff --git a/readme.txt b/readme.txt
index b316c118914..3c0161c36d9 100644
--- a/readme.txt
+++ b/readme.txt
@@ -168,6 +168,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 * Fix - When placing an order again, clear current cart.
 * Fix - Colombia zipcodes are not required
 * Fix - Conflict with WPML joins
+* Fix - IPN check with PayPal redesign
 
 = 1.5.8 - 21/06/2012 =
 * Tweak - Textarea for notes and enabled HTML