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

Resolve conflict

This commit is contained in:
Andrew Benbow 2014-03-26 09:58:51 +00:00 committed by Mike Jolley
parent 9ddca77abd
commit 92a62c4ae4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/class-wc-form-handler.php
View File

@ -517,7 +517,7 @@ class WC_Form_Handler {
$order->cancel_order( __('Order cancelled by customer.', 'woocommerce' ) ); $order->cancel_order( __('Order cancelled by customer.', 'woocommerce' ) );
// Message // Message
wc_add_notice( __( 'Your order was cancelled.', 'woocommerce' ) ); wc_add_notice( apply_filters( 'woocommerce_order_cancelled_notice', __( 'Your order was cancelled.', 'woocommerce' ) ), apply_filters( 'woocommerce_order_cancelled_notice_type', 'notice' ) );
do_action( 'woocommerce_cancelled_order', $order->id ); do_action( 'woocommerce_cancelled_order', $order->id );