Merge pull request #7086 from ChromeOrange/master

Update abstract-wc-order.php
This commit is contained in:
Mike Jolley 2015-01-12 16:46:08 +00:00
commit 2a5fdb0eac
1 changed files with 2 additions and 2 deletions

View File

@ -959,7 +959,7 @@ abstract class WC_Abstract_Order {
if ( ! $this->formatted_shipping_address ) {
if ( $this->shipping_address_1 ) {
if ( $this->shipping_address_1 || $this->shipping_address_2 ) {
// Formatted Addresses
$address = apply_filters( 'woocommerce_order_formatted_shipping_address', array(
@ -990,7 +990,7 @@ abstract class WC_Abstract_Order {
if ( ! $this->shipping_address ) {
if ( $this->shipping_address_1 ) {
if ( $this->shipping_address_1 || $this->shipping_address_2 ) {
// Formatted Addresses
$address = array(