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 #22204 from woocommerce/fix/22201 

Restore empty schema support for register_rest_field
This commit is contained in:
Claudiu Lodromanean 2019-01-02 12:03:41 -08:00 committed by GitHub
parent 87a03b2331 5d22d42c9b
commit 89740f9583
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
includes/abstracts/abstract-wc-rest-controller.php
View File

@ -203,10 +203,12 @@ abstract class WC_REST_Controller extends WP_REST_Controller {
}
$_item = new WP_REST_Request( 'DELETE' );
$_item->set_query_params( array(
'id' => $id,
'force' => true,
) );
$_item->set_query_params(
array(
'id' => $id,
'force' => true,
)
);
$_response = $this->delete_item( $_item );
if ( is_wp_error( $_response ) ) {
@ -350,7 +352,8 @@ abstract class WC_REST_Controller extends WP_REST_Controller {
*/
public function validate_setting_textarea_field( $value, $setting ) {
$value = is_null( $value ) ? '' : $value;
return wp_kses( trim( stripslashes( $value ) ),
return wp_kses(
trim( stripslashes( $value ) ),
array_merge(
array(
'iframe' => array(
@ -436,6 +439,16 @@ abstract class WC_REST_Controller extends WP_REST_Controller {
public function get_fields_for_response( $request ) {
$schema = $this->get_item_schema();
$fields = isset( $schema['properties'] ) ? array_keys( $schema['properties'] ) : array();
$additional_fields = $this->get_additional_fields();
foreach ( $additional_fields as $field_name => $field_options ) {
// For back-compat, include any field with an empty schema
// because it won't be present in $this->get_item_schema().
if ( is_null( $field_options['schema'] ) ) {
$fields[] = $field_name;
}
}
if ( ! isset( $request['_fields'] ) ) {
return $fields;
}