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

[2.6][api] Convert posted names to the API to slugs before save. 

Fixes #11871

@claudiosmweb can you review the API changes made today - there are a
few like this - for inclusion in 2.6 asap. Let me know on slack.
This commit is contained in:
Mike Jolley 2016-09-12 14:37:44 +01:00
parent 8d19028754
commit 978fa976f7
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1556,15 +1556,20 @@ class WC_REST_Products_Controller extends WC_REST_Posts_Controller {
if ( isset( $_attribute['is_variation'] ) && $_attribute['is_variation'] ) {
$_attribute_key = 'attribute_' . sanitize_title( $_attribute['name'] );
$updated_attribute_keys[] = $_attribute_key;
$attribute_value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
if ( isset( $_attribute['is_taxonomy'] ) && $_attribute['is_taxonomy'] ) {
// Don't use wc_clean as it destroys sanitized characters
$_attribute_value = isset( $attribute['option'] ) ? sanitize_title( stripslashes( $attribute['option'] ) ) : '';
} else {
$_attribute_value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
if ( ! empty( $_attribute['is_taxonomy'] ) ) {
// If dealing with a taxonomy, we need to get the slug from the name posted to the API.
$term = get_term_by( 'name', $attribute_value, $attribute_name );
if ( $term && ! is_wp_error( $term ) ) {
$attribute_value = $term->slug;
} else {
$attribute_value = sanitize_title( $attribute_value );
}
}
update_post_meta( $variation_id, $_attribute_key, $_attribute_value );
update_post_meta( $variation_id, $_attribute_key, $attribute_value );
}
}
@ -1610,14 +1615,16 @@ class WC_REST_Products_Controller extends WC_REST_Posts_Controller {
$_attribute = $attributes[ $attribute_name ];
if ( $_attribute['is_variation'] ) {
$value = '';
$value = isset( $attribute['option'] ) ? wc_clean( stripslashes( $attribute['option'] ) ) : '';
if ( isset( $attribute['option'] ) ) {
if ( $_attribute['is_taxonomy'] ) {
// Don't use wc_clean as it destroys sanitized characters.
$value = sanitize_title( trim( stripslashes( $attribute['option'] ) ) );
if ( ! empty( $_attribute['is_taxonomy'] ) ) {
// If dealing with a taxonomy, we need to get the slug from the name posted to the API.
$term = get_term_by( 'name', $attribute_value, $attribute_name );
if ( $term && ! is_wp_error( $term ) ) {
$value = $term->slug;
} else {
$value = wc_clean( trim( stripslashes( $attribute['option'] ) ) );
$value = sanitize_title( $attribute_value );
}
}

2
includes/wc-formatting-functions.php
View File

@ -44,7 +44,7 @@ function wc_string_to_array( $string, $delimiter = ',' ) {
* @return string
*/
function wc_sanitize_taxonomy_name( $taxonomy ) {
return apply_filters( 'sanitize_taxonomy_name', sanitize_title( urldecode( $taxonomy ) ), $taxonomy );
return apply_filters( 'sanitize_taxonomy_name', urldecode( sanitize_title( $taxonomy ) ), $taxonomy );
}
/**