merge conflict fixed

This commit is contained in:
Peter Molnar 2016-01-15 20:20:58 +00:00
commit 8ab0a0d99a

View file

@ -457,12 +457,18 @@ function wp_ffpc_callback( $buffer ) {
$to_store = substr_replace( $buffer, $insertion, $index, 0);
}
/*
if ( isset($wp_ffpc_config['relative_links']) && $wp_ffpc_config['relative_links'] == '1' ) {
$domain = parse_url(get_bloginfo('url'), PHP_URL_HOST);
$to_store = str_replace ( array("https://${domain}/", "http://${domain}/", "https://${domain}", "http://${domain}"), "/", $to_store);
}
*/
/**
* Allows to edit the content to be stored in cache.
*
* This hooks allows the user to edit the page content right before it is about
* to be stored in the cache. This could be useful for alterations like
* minification.
*
* @since 1.10.2
*
* @param string $to_store The content to be stored in cache.
*/
$to_store = apply_filters( 'wp-ffpc-to-store', $to_store );
$prefix_meta = $wp_ffpc_backend->key ( $wp_ffpc_config['prefix_meta'] );
$wp_ffpc_backend->set ( $prefix_meta, $meta );