From 9e71cd699fb2e463dadd6415963ced1d2b639eeb Mon Sep 17 00:00:00 2001
From: Brent Shepherd <thenbrent@gmail.com>
Date: Wed, 27 Mar 2013 17:58:48 +1000
Subject: [PATCH] Update woocommerce_get_formatted_product_name use

To use new WC_Product::get_formatted_name() function. For #2788
---
 .../post-types/writepanels/writepanel-coupon_data.php  | 10 ++++------
 .../writepanels/writepanel-order_downloads.php         |  3 +--
 .../post-types/writepanels/writepanel-product_data.php | 10 ++++------
 woocommerce-ajax.php                                   |  2 +-
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/admin/post-types/writepanels/writepanel-coupon_data.php b/admin/post-types/writepanels/writepanel-coupon_data.php
index 8a0ed594cf1..57e42e86106 100644
--- a/admin/post-types/writepanels/writepanel-coupon_data.php
+++ b/admin/post-types/writepanels/writepanel-coupon_data.php
@@ -79,10 +79,9 @@ function woocommerce_coupon_data_meta_box( $post ) {
 						$product_ids = array_map( 'absint', explode( ',', $product_ids ) );
 						foreach ( $product_ids as $product_id ) {
 
-							$product      = get_product( $product_id );
-							$product_name = woocommerce_get_formatted_product_name( $product );
+							$product = get_product( $product_id );
 
-							echo '<option value="' . esc_attr( $product_id ) . '" selected="selected">' . wp_kses_post( $product_name ) . '</option>';
+							echo '<option value="' . esc_attr( $product_id ) . '" selected="selected">' . wp_kses_post( $product->get_formatted_name() ) . '</option>';
 						}
 					}
 				?>
@@ -99,10 +98,9 @@ function woocommerce_coupon_data_meta_box( $post ) {
 						$product_ids = array_map( 'absint', explode( ',', $product_ids ) );
 						foreach ( $product_ids as $product_id ) {
 
-							$product      = get_product( $product_id );
-							$product_name = woocommerce_get_formatted_product_name( $product );
+							$product = get_product( $product_id );
 
-							echo '<option value="' . esc_attr( $product_id ) . '" selected="selected">' . esc_html( $product_name ) . '</option>';
+							echo '<option value="' . esc_attr( $product_id ) . '" selected="selected">' . esc_html( $product->get_formatted_name() ) . '</option>';
 						}
 					}
 				?>
diff --git a/admin/post-types/writepanels/writepanel-order_downloads.php b/admin/post-types/writepanels/writepanel-order_downloads.php
index d79987712d4..a5818beb11a 100644
--- a/admin/post-types/writepanels/writepanel-order_downloads.php
+++ b/admin/post-types/writepanels/writepanel-order_downloads.php
@@ -76,9 +76,8 @@ function woocommerce_order_downloads_meta_box() {
 						if ( $products ) foreach ( $products as $product ) {
 
 							$product_object = get_product( $product->ID );
-							$product_name   = woocommerce_get_formatted_product_name( $product_object );
 
-							echo '<option value="' . esc_attr( $product->ID ) . '">' . esc_html( $product_name ) . '</option>';
+							echo '<option value="' . esc_attr( $product->ID ) . '">' . esc_html( $product_object->get_formatted_name() ) . '</option>';
 
 						}
 					?>
diff --git a/admin/post-types/writepanels/writepanel-product_data.php b/admin/post-types/writepanels/writepanel-product_data.php
index cb425b648a5..c86064d7828 100644
--- a/admin/post-types/writepanels/writepanel-product_data.php
+++ b/admin/post-types/writepanels/writepanel-product_data.php
@@ -526,10 +526,9 @@ function woocommerce_product_data_box() {
 					if ( $product_ids ) {
 						foreach ( $product_ids as $product_id ) {
 
-							$product      = get_product( $product_id );
-							$product_name = woocommerce_get_formatted_product_name( $product );
+							$product = get_product( $product_id );
 
-							echo '<option value="' . esc_attr( $product_id ) . '" selected="selected">' . esc_html( $product_name ) . '</option>';
+							echo '<option value="' . esc_attr( $product_id ) . '" selected="selected">' . esc_html( $product->get_formatted_name() ) . '</option>';
 						}
 					}
 				?>
@@ -543,10 +542,9 @@ function woocommerce_product_data_box() {
 					if ( $product_ids ) {
 						foreach ( $product_ids as $product_id ) {
 
-							$product      = get_product( $product_id );
-							$product_name = woocommerce_get_formatted_product_name( $product );
+							$product = get_product( $product_id );
 
-							echo '<option value="' . esc_attr( $product_id ) . '" selected="selected">' . esc_html( $product_name ) . '</option>';
+							echo '<option value="' . esc_attr( $product_id ) . '" selected="selected">' . esc_html( $product->get_formatted_name() ) . '</option>';
 						}
 					}
 				?>
diff --git a/woocommerce-ajax.php b/woocommerce-ajax.php
index 71cafbc465d..a2b2405d431 100644
--- a/woocommerce-ajax.php
+++ b/woocommerce-ajax.php
@@ -1607,7 +1607,7 @@ function woocommerce_json_search_products( $x = '', $post_types = array('product
 
 		$product = get_product( $post );
 
-		$found_products[ $post ] = woocommerce_get_formatted_product_name( $product );
+		$found_products[ $post ] = $product->get_formatted_name();
 
 	}