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

Fixed how CRUD delete items by REST API

This commit is contained in:
Claudio Sanches 2017-02-16 22:25:07 -02:00
parent 197d2eb98e
commit 01a5296e7e
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,6 +373,7 @@ abstract class WC_REST_CRUD_Controller extends WC_REST_Posts_Controller {
$id = (int) $request['id']; $id = (int) $request['id'];
$force = (bool) $request['force']; $force = (bool) $request['force'];
$object = $this->get_object( (int) $request['id'] ); $object = $this->get_object( (int) $request['id'] );
$result = false;
if ( 0 === $object->get_id() ) { if ( 0 === $object->get_id() ) {
return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'Invalid ID.', 'woocommerce' ), array( 'status' => 404 ) ); return new WP_Error( "woocommerce_rest_{$this->post_type}_invalid_id", __( 'Invalid ID.', 'woocommerce' ), array( 'status' => 404 ) );
@ -400,7 +401,8 @@ abstract class WC_REST_CRUD_Controller extends WC_REST_Posts_Controller {
// If we're forcing, then delete permanently. // If we're forcing, then delete permanently.
if ( $force ) { if ( $force ) {
$result = $object->delete( true ); $object->delete( true );
$result = 0 === $object->get_id();
} else { } else {
// If we don't support trashing for this type, error out. // If we don't support trashing for this type, error out.
if ( ! $supports_trash ) { if ( ! $supports_trash ) {
@ -409,12 +411,15 @@ abstract class WC_REST_CRUD_Controller extends WC_REST_Posts_Controller {
} }
// Otherwise, only trash if we haven't already. // Otherwise, only trash if we haven't already.
if ( is_callable( array( $object, 'get_status' ) ) && 'trash' === $object->get_status() ) { if ( is_callable( array( $object, 'get_status' ) ) ) {
/* translators: %s: post type */ if ( 'trash' === $object->get_status() ) {
return new WP_Error( 'woocommerce_rest_already_trashed', sprintf( __( 'The %s has already been deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 410 ) ); /* translators: %s: post type */
} return new WP_Error( 'woocommerce_rest_already_trashed', sprintf( __( 'The %s has already been deleted.', 'woocommerce' ), $this->post_type ), array( 'status' => 410 ) );
}
$result = $object->delete(); $object->delete();
$result = 'trash' === $object->get_status();
}
} }
if ( ! $result ) { if ( ! $result ) {