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

Tweak download handler Closes #3394.

This commit is contained in:
Mike Jolley 2013-08-13 14:53:55 +01:00
parent aed9a0aceb
commit 131f692855
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/admin/post-types/meta-boxes/class-wc-meta-box-order-downloads.php
View File

@ -129,7 +129,7 @@ class WC_Meta_Box_Order_Downloads {
numberOfMonths: 1,
showButtonPanel: true,
showOn: "button",
buttonImage: woocommerce_writepanel_params.calendar_image,
buttonImage: woocommerce_admin_meta_boxes.calendar_image,
buttonImageOnly: true
});

14
includes/class-wc-download-handler.php
View File

@ -25,7 +25,7 @@ class WC_Download_Handler {
public function download_product() {
if ( isset( $_GET['download_file'] ) && isset( $_GET['order'] ) && isset( $_GET['email'] ) ) {
global $wpdb, $is_IE;
global $wpdb;
$product_id = (int) urldecode($_GET['download_file']);
$order_key = urldecode( $_GET['order'] );
@ -121,17 +121,15 @@ class WC_Download_Handler {
$file_path = $_product->get_file_download_path( $download_id );
// Download it!
$this->download( $file_path );
$this->download( $file_path, $product_id );
}
}
/**
* Download a file - hook into init function.
*
* @access public
* @return void
*/
function download( $file_path ) {
public function download( $file_path, $product_id ) {
global $wpdb, $is_IE;
$file_download_method = apply_filters( 'woocommerce_file_download_method', get_option( 'woocommerce_file_download_method' ), $product_id );
@ -212,10 +210,8 @@ class WC_Download_Handler {
@session_write_close();
@ini_set( 'zlib.output_compression', 'Off' );
@ob_end_clean();
if ( ob_get_level() )
@ob_end_clean(); // Zip corruption fix
@ob_clean(); // Clear the output buffer
if ( $is_IE && is_ssl() ) {
// IE bug prevents download via SSL when Cache Control and Pragma no-cache headers set.