Merge branch 'master' of github:/petermolnar/wp-ffpc Conflicts: wp-ffpc-class.php
Peter Molnar hello@petermolnar.eu
Fri, 10 Feb 2017 21:34:54 +0000
2 files changed,
5 insertions(+),
5 deletions(-)
M
wp-ffpc-acache.php
→
wp-ffpc-acache.php
@@ -8,7 +8,7 @@ */
function __wp_ffpc_debug__ ( $text ) { if ( defined('WP_FFPC__DEBUG_MODE') && WP_FFPC__DEBUG_MODE == true) - error_log ( __FILE__ . ': ' . $text ); + error_log ( 'WP_FFPC_ACache' . ': ' . $text ); } /* check for WP cache enabled*/@@ -155,7 +155,7 @@ $key = $wp_ffpc_backend->key ( $key );
$value = $wp_ffpc_backend->get ( $key ); if ( ! $value ) { - __wp_ffpc_debug__("No cached data foundd"); + __wp_ffpc_debug__("No cached data found"); /* does not matter which is missing, we need both, if one fails, no caching */ wp_ffpc_start(); return;
M
wp-ffpc-class.php
→
wp-ffpc-class.php
@@ -412,8 +412,8 @@ if ( class_exists( 'WooCommerce' ) ) {
$page_wc_checkout=str_replace( home_url(), '', wc_get_page_permalink( 'checkout' ) ); $page_wc_myaccount=str_replace( home_url(), '', wc_get_page_permalink( 'myaccount' ) ); $page_wc_cart=str_replace( home_url(), '', wc_get_page_permalink( 'cart' ) ); - $this->options['nocache_woocommerce_url'] = '^'.$page_wc_checkout.'|^'.$page_wc_myaccount.'|^'.$page_wc_cart; - + $wcapi='^/wc-api|^/\?wc-api='; + $this->options['nocache_woocommerce_url'] = '^'.$page_wc_checkout.'|^'.$page_wc_myaccount.'|^'.$page_wc_cart.'|'.$wcapi; } else { $this->options['nocache_woocommerce_url'] = ''; }@@ -1364,4 +1364,4 @@ }
} -endif;+endif;