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

Merge branch 'master' of https://github.com/woothemes/woocommerce

This commit is contained in:
Mike Jolley 2014-06-03 16:24:26 +01:00
parent fb5184dcea be4be147b9
commit a6625e2557
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/class-wc-post-types.php
View File

@ -209,7 +209,7 @@ class WC_Post_types {
);
}
}
do_action( 'woocommerce_after_register_taxonomy' );
}
}
@ -262,6 +262,10 @@ class WC_Post_types {
)
);
if ( preg_match( '/\/(.+)(\/%product_cat%)$/' , $product_permalink, $matches ) ) {
add_rewrite_rule( '^' . $matches[1] . '/.+?/[^/]+/([^/]+)/?$', 'index.php?attachment=$matches[1]', 'top' );
}
register_post_type( "product_variation",
apply_filters( 'woocommerce_register_post_type_product_variation',
array(

24
includes/wc-core-functions.php
View File

@ -408,3 +408,27 @@ function get_woocommerce_api_url( $path ) {
function wc_get_log_file_path( $handle ) {
return trailingslashit( WC_LOG_DIR ) . $handle . '-' . sanitize_file_name( wp_hash( $handle ) ) . '.log';
}
/**
* Fix the rewrite rules when the product permalink have %product_cat% flag.
*
* @since 2.2
* @param array $rules
* @return array
*/
function wc_fix_rewrite_rules( $rules ) {
$permalinks = get_option( 'woocommerce_permalinks' );
$product_permalink = empty( $permalinks['product_base'] ) ? _x( 'product', 'slug', 'woocommerce' ) : $permalinks['product_base'];
if ( preg_match( '/\/(.+)(\/%product_cat%)/' , $product_permalink, $matches ) ) {
foreach ( $rules as $rule => $rewrite ) {
if ( preg_match( '/^' . $matches[1] . '/', $rule ) && preg_match( '/^(index\.php\?product_cat)(?!(.*product))/', $rewrite ) ) {
unset( $rules[ $rule ] );
}
}
}
return $rules;
}
add_filter( 'rewrite_rules_array', 'wc_fix_rewrite_rules' );