Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10917 from kreamweb/master 

Add check of $raw_countries before the foreach in WC_Countries
This commit is contained in:
Mike Jolley 2016-05-16 10:12:45 +01:00
parent 9fe8a1bcdb 0a2c0af5ff
commit 557bd9e8b7
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
includes/class-wc-countries.php
View File

@ -231,8 +231,10 @@ class WC_Countries {
$raw_countries = get_option( 'woocommerce_specific_ship_to_countries' );
foreach ( $raw_countries as $country ) {
$countries[ $country ] = $this->countries[ $country ];
if ( $raw_countries ) {
foreach ( $raw_countries as $country ) {
$countries[ $country ] = $this->countries[ $country ];
}
}
return apply_filters( 'woocommerce_countries_shipping_countries', $countries );
@ -251,9 +253,11 @@ class WC_Countries {
$raw_countries = get_option( 'woocommerce_specific_allowed_countries' );
foreach ( $raw_countries as $country ) {
if ( isset( $this->states[ $country ] ) ) {
$states[ $country ] = $this->states[ $country ];
if ( $raw_countries ) {
foreach ( $raw_countries as $country ) {
if ( isset( $this->states[ $country ] ) ) {
$states[ $country ] = $this->states[ $country ];
}
}
}
@ -277,9 +281,11 @@ class WC_Countries {
$raw_countries = get_option( 'woocommerce_specific_ship_to_countries' );
foreach ( $raw_countries as $country ) {
if ( ! empty( $this->states[ $country ] ) ) {
$states[ $country ] = $this->states[ $country ];
if ( $raw_countries ) {
foreach ( $raw_countries as $country ) {
if ( ! empty( $this->states[ $country ] ) ) {
$states[ $country ] = $this->states[ $country ];
}
}
}