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 #14535 from woocommerce/fix/item-get_order 

Ensure order is not cached before download permissions are generated
This commit is contained in:
Claudiu Lodromanean 2017-04-19 10:12:39 -07:00 committed by GitHub
parent 97958de059 e1ae5bded2
commit beab1fd0b8
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
includes/class-wc-order-item-product.php
View File

@ -350,16 +350,17 @@ class WC_Order_Item_Product extends WC_Order_Item {
* @return array
*/
public function get_item_downloads() {
$files = array();
$product = $this->get_product();
$order = $this->get_order();
$files = array();
$product = $this->get_product();
$order = $this->get_order();
$product_id = $this->get_variation_id() ? $this->get_variation_id() : $this->get_product_id();
if ( $product && $order && $product->is_downloadable() && $order->is_download_permitted() ) {
$data_store = WC_Data_Store::load( 'customer-download' );
$customer_downloads = $data_store->get_downloads( array(
'user_email' => $order->get_billing_email(),
'order_id' => $order->get_id(),
'product_id' => $this->get_variation_id() ? $this->get_variation_id() : $this->get_product_id(),
'product_id' => $product_id,
) );
foreach ( $customer_downloads as $customer_download ) {
$download_id = $customer_download->get_download_id();
@ -367,7 +368,12 @@ class WC_Order_Item_Product extends WC_Order_Item {
if ( $product->has_file( $download_id ) ) {
$file = $product->get_file( $download_id );
$files[ $download_id ] = $file->get_data();
$files[ $download_id ]['download_url'] = $this->get_item_download_url( $download_id );
$files[ $download_id ]['download_url'] = add_query_arg( array(
'download_file' => $product_id,
'order' => $order->get_order_key(),
'email' => urlencode( $order->get_billing_email() ),
'key' => $download_id,
), trailingslashit( home_url() ) );
}
}
}

11
includes/class-wc-order-item.php
View File

@ -26,12 +26,6 @@ class WC_Order_Item extends WC_Data implements ArrayAccess {
'name' => '',
);
/**
* May store an order to prevent retriving it multiple times.
* @var object
*/
protected $order;
/**
* Stores meta in cache for future reads.
* A group must be set to to enable caching.
@ -122,10 +116,7 @@ class WC_Order_Item extends WC_Data implements ArrayAccess {
* @return int
*/
public function get_order() {
if ( ! $this->order ) {
$this->order = wc_get_order( $this->get_order_id() );
}
return $this->order;
return wc_get_order( $this->get_order_id() );
}
/*