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

Pass request in backward compatible way

This commit is contained in:
vedanshujain 2020-06-03 17:49:41 +05:30
parent e78c592b25
commit 2d2c764c89
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
includes/rest-api/Controllers/Version2/class-wc-rest-products-v2-controller.php
View File

@ -159,8 +159,7 @@ class WC_REST_Products_V2_Controller extends WC_REST_CRUD_Controller {
*/
public function prepare_object_for_response( $object, $request ) {
$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
$fields = $this->get_fields_for_response( $request );
$data = $this->get_product_data( $object, $context, $fields );
$data = $this->get_product_data( $object, $context, $request );
// Add variations to variable products.
if ( $object->is_type( 'variable' ) && $object->has_child() ) {
@ -626,14 +625,18 @@ class WC_REST_Products_V2_Controller extends WC_REST_CRUD_Controller {
/**
* Get product data.
*
* @param WC_Product $product Product instance.
* @param string $context Request context.
* Options: 'view' and 'edit'.
* @param array $fields List of fields to fetch. If empty, then all fields will be returned.
* @param WC_Product $product Product instance.
* @param string $context Request context. Options: 'view' and 'edit'.
* @param WP_REST_Request $request Current request object. For backward compatibility, we pass this argument silently.
*
* @return array
*/
protected function get_product_data( $product, $context = 'view', $fields = array() ) {
protected function get_product_data( $product, $context = 'view' ) {
$fields = array();
$request = func_get_arg( 2 );
if ( $request instanceof WP_REST_Request ) {
$fields = $this->get_fields_for_response( $request );
}
$base_data = array(
'id' => $product->get_id(),
'name' => $product->get_name( $context ),

6
includes/rest-api/Controllers/Version3/class-wc-rest-products-controller.php
View File

@ -1346,10 +1346,12 @@ class WC_REST_Products_Controller extends WC_REST_Products_V2_Controller {
* @param string $context Request context.
* Options: 'view' and 'edit'.
* @param array $fields List of fields to fetch. If empty, then all fields will be returned.
* For backward compatibility, we pass this argument silently.
* @return array
*/
protected function get_product_data( $product, $context = 'view', $fields = array() ) {
$data = parent::get_product_data( $product, $context, $fields );
protected function get_product_data( $product, $context = 'view' ) {
$request = func_get_arg( 2 );
$data = parent::get_product_data( $product, $context, $request );
// Replace in_stock with stock_status.
$pos = array_search( 'in_stock', array_keys( $data ), true );