Merge pull request #2960 from bengummer/issue-2958

patch shop_order.php for issue 2958
This commit is contained in:
Mike Jolley 2013-04-15 07:07:19 -07:00
commit e16d222f96
1 changed files with 2 additions and 2 deletions

View File

@ -132,7 +132,7 @@ function woocommerce_custom_order_columns( $column ) {
} else {
$t_time = get_the_time( __( 'Y/m/d g:i:s A', 'woocommerce' ), $post );
$gmt_time = strtotime( $post->post_date_gmt );
$gmt_time = strtotime( $post->post_date_gmt . ' UTC' );
$time_diff = current_time('timestamp', 1) - $gmt_time;
if ( $time_diff > 0 && $time_diff < 24*60*60 )
@ -561,4 +561,4 @@ function woocommerce_delete_order_items( $postid )
}
}
add_action( 'before_delete_post', 'woocommerce_delete_order_items' );
add_action( 'before_delete_post', 'woocommerce_delete_order_items' );