From 135316033067046dad462d86b50c2f7bcaa2b24b Mon Sep 17 00:00:00 2001 From: Mike Jolley Date: Wed, 22 Jun 2016 11:35:21 +0100 Subject: [PATCH 1/3] Removed non-existent country (Netherlands Antilles) from https://en.wikipedia.org/wiki/ISO_3166-1. Closes #11217 --- i18n/countries.php | 1 - readme.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/countries.php b/i18n/countries.php index 47ede4fbed0..386e6d0b103 100644 --- a/i18n/countries.php +++ b/i18n/countries.php @@ -171,7 +171,6 @@ return array( 'NR' => __( 'Nauru', 'woocommerce' ), 'NP' => __( 'Nepal', 'woocommerce' ), 'NL' => __( 'Netherlands', 'woocommerce' ), - 'AN' => __( 'Netherlands Antilles', 'woocommerce' ), 'NC' => __( 'New Caledonia', 'woocommerce' ), 'NZ' => __( 'New Zealand', 'woocommerce' ), 'NI' => __( 'Nicaragua', 'woocommerce' ), diff --git a/readme.txt b/readme.txt index a53d92fff70..cbc9c43a62e 100644 --- a/readme.txt +++ b/readme.txt @@ -170,6 +170,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc * Fix - Javascript show/hide of option in free shipping method. * Fix - Convert ellipsis to three periods when saving postcodes. * Fix - Prevent get_terms returning duplicates. +* Fix - Removed non-existent country (Netherlands Antilles) from https://en.wikipedia.org/wiki/ISO_3166-1. * Tweak - Made customer pay link display if order needs_payment() rather than checking pending status. * Tweak - Zones - Wording clarifications. * Tweak - Zones - Match zones with postcodes but no country. From 270dd30fd5ff300d2bce8981c1a7a8298228f6f3 Mon Sep 17 00:00:00 2001 From: Mike Jolley Date: Wed, 22 Jun 2016 11:38:39 +0100 Subject: [PATCH 2/3] Remove non-existant callback Fixes #11210 --- includes/admin/class-wc-admin-meta-boxes.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/includes/admin/class-wc-admin-meta-boxes.php b/includes/admin/class-wc-admin-meta-boxes.php index e9eddd76ab7..cb6fc86e1e0 100644 --- a/includes/admin/class-wc-admin-meta-boxes.php +++ b/includes/admin/class-wc-admin-meta-boxes.php @@ -64,9 +64,6 @@ class WC_Admin_Meta_Boxes { // Save Coupon Meta Boxes add_action( 'woocommerce_process_shop_coupon_meta', 'WC_Meta_Box_Coupon_Data::save', 10, 2 ); - // Save Rating Meta Boxes - add_action( 'comment_edit_redirect', 'WC_Meta_Box_Order_Reviews::save', 1, 2 ); - // Error handling (for showing errors from meta boxes on next page load) add_action( 'admin_notices', array( $this, 'output_errors' ) ); add_action( 'shutdown', array( $this, 'save_errors' ) ); From 4ddf220b9b979379a1a4350e9e0c7778ed7af4b9 Mon Sep 17 00:00:00 2001 From: Mike Jolley Date: Wed, 22 Jun 2016 11:56:43 +0100 Subject: [PATCH 3/3] Pass $this to backorder filter. Closes #11216 --- includes/abstracts/abstract-wc-product.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/abstracts/abstract-wc-product.php b/includes/abstracts/abstract-wc-product.php index 1c0097548d2..0e3874bcd23 100644 --- a/includes/abstracts/abstract-wc-product.php +++ b/includes/abstracts/abstract-wc-product.php @@ -632,7 +632,7 @@ class WC_Product { * @return bool */ public function backorders_allowed() { - return apply_filters( 'woocommerce_product_backorders_allowed', $this->backorders === 'yes' || $this->backorders === 'notify' ? true : false, $this->id ); + return apply_filters( 'woocommerce_product_backorders_allowed', $this->backorders === 'yes' || $this->backorders === 'notify' ? true : false, $this->id, $this ); } /**