Sale flash filter + undefined fix in actions

This commit is contained in:
Mike Jolley 2011-09-09 11:54:46 +01:00
parent ccf6a04274
commit 96fcd469dc
2 changed files with 4 additions and 2 deletions

View File

@ -453,7 +453,8 @@ function woocommerce_add_to_cart_action( $url = false ) {
add_action( 'wp_header', 'woocommerce_clear_cart_on_return' );
function woocommerce_clear_cart_on_return() {
global $woocommerce;
if (is_page(get_option('woocommerce_thanks_page_id'))) :
if (isset($_GET['order'])) $order_id = $_GET['order']; else $order_id = 0;
@ -475,6 +476,7 @@ function woocommerce_clear_cart_on_return() {
add_action( 'init', 'woocommerce_clear_cart_after_payment' );
function woocommerce_clear_cart_after_payment( $url = false ) {
global $woocommerce;
if (isset($_SESSION['order_awaiting_payment']) && $_SESSION['order_awaiting_payment'] > 0) :

View File

@ -36,7 +36,7 @@ if (!function_exists('woocommerce_output_content_wrapper_end')) {
**/
if (!function_exists('woocommerce_show_product_sale_flash')) {
function woocommerce_show_product_sale_flash( $post, $_product ) {
if ($_product->is_on_sale()) echo '<span class="onsale">'.__('Sale!', 'woothemes').'</span>';
if ($_product->is_on_sale()) echo apply_filters('woocommerce_sale_flash', '<span class="onsale">'.__('Sale!', 'woothemes').'</span>', $post, $_product);
}
}