Merge pull request #5464 from tamarazuk/master

Order Item Meta - Check if attribute term exists
This commit is contained in:
Mike Jolley 2014-05-12 12:35:11 +01:00
commit d8020de76c
1 changed files with 4 additions and 4 deletions

View File

@ -59,11 +59,11 @@ class WC_Order_Item_Meta {
// If this is a term slug, get the term's nice name // If this is a term slug, get the term's nice name
if ( taxonomy_exists( $attribute_key ) ) { if ( taxonomy_exists( $attribute_key ) ) {
$term = get_term_by( 'slug', $meta_value, $attribute_key ); $term = get_term_by( 'slug', $meta_value, $attribute_key );
if ( ! is_wp_error( $term ) && $term->name ) { if ( ! is_wp_error( $term ) && is_object( $term ) && $term->name ) {
$meta_value = $term->name; $meta_value = $term->name;
} }
// If we have a product, and its not a term, try to find its non-sanitized name // If we have a product, and its not a term, try to find its non-sanitized name
} elseif ( $this->product ) { } elseif ( $this->product ) {
$product_attributes = $this->product->get_attributes(); $product_attributes = $this->product->get_attributes();
@ -102,7 +102,7 @@ class WC_Order_Item_Meta {
else else
echo $output; echo $output;
} }
return ''; return '';
} }
} }