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

Remove line breaks

This commit is contained in:
Mike Jolley 2015-06-17 15:19:04 +01:00
parent 4a9c2aece9
commit b8f644fe9e
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
includes/class-wc-customer.php
View File

@ -252,7 +252,6 @@ class WC_Customer {
return $this->shipping_state;
}
/**
* Gets the country from the current session.
*
@ -262,7 +261,6 @@ class WC_Customer {
return $this->shipping_country;
}
/**
* Gets the postcode from the current session.
*
@ -272,7 +270,6 @@ class WC_Customer {
return empty( $this->shipping_postcode ) ? '' : wc_format_postcode( $this->shipping_postcode, $this->get_shipping_country() );
}
/**
* Gets the city from the current session.
*
@ -314,27 +311,23 @@ class WC_Customer {
}
if ( 'base' === $tax_based_on || ( 'geolocation_ajax' === get_option( 'woocommerce_default_customer_address' ) && empty( $_GET['location'] ) && ! defined( 'WOOCOMMERCE_CHECKOUT' ) && ! defined( 'WOOCOMMERCE_CART' ) ) ) {
$default = wc_get_base_location();
$country = $default['country'];
$state = $default['state'];
$postcode = '';
$city = '';
} elseif ( $tax_based_on == 'billing' ) {
} elseif ( 'billing' === $tax_based_on ) {
$country = $this->get_country();
$state = $this->get_state();
$postcode = $this->get_postcode();
$city = $this->get_city();
} else {
$country = $this->get_shipping_country();
$state = $this->get_shipping_state();
$postcode = $this->get_shipping_postcode();
$city = $this->get_shipping_city();
}
return apply_filters( 'woocommerce_customer_taxable_address', array( $country, $state, $postcode, $city ) );
@ -385,7 +378,6 @@ class WC_Customer {
}
}
/**
* Sets session data for the location.
*

1
includes/wc-core-functions.php
View File

@ -762,7 +762,6 @@ function wc_get_customer_default_location() {
if ( ! empty( $_GET['location'] ) ) {
$location = wc_format_country_state_string( wc_clean( $_GET['location'] ) );
}
// Base fallback
if ( empty( $location['country'] ) ) {
$location = wc_format_country_state_string( apply_filters( 'woocommerce_customer_default_location', get_option( 'woocommerce_default_country' ) ) );