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 #13462 from woocommerce/fix-13446-2 

Accept only list of term IDs while setting product categories and tags
This commit is contained in:
Claudiu Lodromanean 2017-03-03 13:38:12 -08:00 committed by GitHub
parent ee276e10a4 e97c21c1cc
commit 22edf2590d
6 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
includes/abstracts/abstract-wc-product.php
View File

@ -1086,7 +1086,7 @@ class WC_Product extends WC_Abstract_Legacy_Product {
* @param array $term_ids List of terms IDs.
*/
public function set_category_ids( $term_ids ) {
$this->set_prop( 'category_ids', $this->sanitize_term_ids( $term_ids, 'product_cat' ) );
$this->set_prop( 'category_ids', array_unique( array_map( 'intval', $term_ids ) ) );
}
/**
@ -1096,7 +1096,7 @@ class WC_Product extends WC_Abstract_Legacy_Product {
* @param array $term_ids List of terms IDs.
*/
public function set_tag_ids( $term_ids ) {
$this->set_prop( 'tag_ids', $this->sanitize_term_ids( $term_ids, 'product_tag' ) );
$this->set_prop( 'tag_ids', array_unique( array_map( 'intval', $term_ids ) ) );
}
/**
@ -1251,31 +1251,6 @@ class WC_Product extends WC_Abstract_Legacy_Product {
|--------------------------------------------------------------------------
*/
/**
* Get term ids from either a list of names, ids, or terms.
*
* @since 2.7.0
* @param array $terms
* @param string $taxonomy
*/
protected function sanitize_term_ids( $terms, $taxonomy ) {
$term_ids = array();
foreach ( $terms as $term ) {
if ( is_object( $term ) ) {
$term_ids[] = $term->term_id;
} elseif ( is_integer( $term ) ) {
$term_ids[] = absint( $term );
} else {
$term_object = get_term_by( 'name', $term, $taxonomy );
if ( $term_object && ! is_wp_error( $term_object ) ) {
$term_ids[] = $term_object->term_id;
}
}
}
return $term_ids;
}
/**
* Ensure properties are set correctly before save.
* @since 2.7.0

1
includes/api/class-wc-rest-products-controller.php
View File

@ -1134,7 +1134,6 @@ class WC_REST_Products_Controller extends WC_REST_Legacy_Products_Controller {
*/
protected function save_taxonomy_terms( $product, $terms, $taxonomy = 'cat' ) {
$term_ids = wp_list_pluck( $terms, 'id' );
$term_ids = array_unique( array_map( 'intval', $term_ids ) );
if ( 'cat' === $taxonomy ) {
$product->set_category_ids( $term_ids );

6
includes/api/legacy/v2/class-wc-api-products.php
View File

@ -1182,14 +1182,12 @@ class WC_API_Products extends WC_API_Resource {
// Product categories
if ( isset( $data['categories'] ) && is_array( $data['categories'] ) ) {
$term_ids = array_unique( array_map( 'intval', $data['categories'] ) );
$product->set_category_ids( $term_ids );
$product->set_category_ids( $data['categories'] );
}
// Product tags
if ( isset( $data['tags'] ) && is_array( $data['tags'] ) ) {
$term_ids = array_unique( array_map( 'intval', $data['tags'] ) );
$product->set_tag_ids( $term_ids );
$product->set_tag_ids( $data['tags'] );
}
// Downloadable

6
includes/api/legacy/v3/class-wc-api-products.php
View File

@ -1671,14 +1671,12 @@ class WC_API_Products extends WC_API_Resource {
// Product categories.
if ( isset( $data['categories'] ) && is_array( $data['categories'] ) ) {
$term_ids = array_unique( array_map( 'intval', $data['categories'] ) );
$product->set_category_ids( $term_ids );
$product->set_category_ids( $data['categories'] );
}
// Product tags.
if ( isset( $data['tags'] ) && is_array( $data['tags'] ) ) {
$term_ids = array_unique( array_map( 'intval', $data['tags'] ) );
$product->set_tag_ids( $term_ids );
$product->set_tag_ids( $data['tags'] );
}
// Downloadable.

1
includes/api/v1/class-wc-rest-products-controller.php
View File

@ -982,7 +982,6 @@ class WC_REST_Products_V1_Controller extends WC_REST_Posts_Controller {
*/
protected function save_taxonomy_terms( $product, $terms, $taxonomy = 'cat' ) {
$term_ids = wp_list_pluck( $terms, 'id' );
$term_ids = array_unique( array_map( 'intval', $term_ids ) );
if ( 'cat' === $taxonomy ) {
$product->set_category_ids( $term_ids );

2
tests/unit-tests/product/data.php
View File

@ -89,7 +89,7 @@ class WC_Tests_Product_Data extends WC_Unit_Test_Case {
$test_tag_2 = wp_insert_term( 'Tag 2', 'product_tag' );
$getters_and_setters = array(
'tag_ids' => array( 'Tag 1', 'Tag 2' ),
'tag_ids' => array( $test_tag_1['term_id'], $test_tag_2['term_id'] ),
'category_ids' => array( $test_cat_1['term_id'], $test_cat_2['term_id'] ),
);
$product = new WC_Product_Simple;