Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Uses home_url() in get_current_url_supercache_dir #613

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Uses home_url() in get_current_url_supercache_dir #613

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b36d6cf
Uses home_url() in get_current_url_supercache_dir
stodorovic Sep 16, 2018
ed2c135
Uses parse_url to extract path - get_supercache_dir
stodorovic Sep 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions wp-cache-phase2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,26 +561,28 @@ function get_supercache_dir( $blog_id = 0 ) {
}
return trailingslashit( apply_filters( 'wp_super_cache_supercachedir', $cache_path . 'supercache/' . trailingslashit( strtolower( preg_replace( '/:.*$/', '', str_replace( 'http://', '', str_replace( 'https://', '', $home ) ) ) ) ) ) );
}

function get_current_url_supercache_dir( $post_id = 0 ) {
global $cached_direct_pages, $cache_path, $wp_cache_request_uri, $WPSC_HTTP_HOST, $wp_cache_home_path;
global $cached_direct_pages, $cache_path, $wp_cache_request_uri, $WPSC_HTTP_HOST;
static $saved_supercache_dir = array();

if ( isset( $saved_supercache_dir[ $post_id ] ) ) {
return $saved_supercache_dir[ $post_id ];
}

$DONOTREMEMBER = 0;
if ( $post_id != 0 ) {
$site_url = site_url();
if ( 0 !== $post_id ) {
$home_url = home_url();
$permalink = get_permalink( $post_id );
if ( false === strpos( $permalink, $site_url ) ) {
if ( 0 !== strpos( $permalink, $home_url ) ) {
/*
* Sometimes site_url doesn't return the siteurl. See https://wordpress.org/support/topic/wp-super-cache-not-refreshing-post-after-comments-made
* Replaced site_url with home_url - https:/Automattic/wp-super-cache/pull/613 .
*/
$DONOTREMEMBER = 1;
wp_cache_debug( "get_current_url_supercache_dir: WARNING! site_url ($site_url) not found in permalink ($permalink).", 1 );
wp_cache_debug( "get_current_url_supercache_dir: WARNING! home_url ($home_url) not found in permalink ($permalink).", 1 );
if ( preg_match( '`^(https?:)?//([^/]+)(/.*)?$`i', $permalink, $matches ) ) {
if ( $WPSC_HTTP_HOST != $matches[2] ) {
if ( $WPSC_HTTP_HOST !== $matches[2] ) {
wp_cache_debug( "get_current_url_supercache_dir: WARNING! SERVER_NAME ({$WPSC_HTTP_HOST}) not found in permalink ($permalink).", 1 );
}
wp_cache_debug( "get_current_url_supercache_dir: Removing SERVER_NAME ({$matches[2]}) from permalink ($permalink). Is the url right?", 1 );
Expand All @@ -593,37 +595,36 @@ function get_current_url_supercache_dir( $post_id = 0 ) {
$uri = '';
}
} else {
$uri = str_replace( $site_url, '', $permalink );
if ( strpos( $uri, $wp_cache_home_path ) !== 0 )
$uri = rtrim( $wp_cache_home_path, '/' ) . $uri;
$uri = function_exists( 'wp_parse_url' ) ? (string) wp_parse_url( $permalink, PHP_URL_PATH ) : (string) parse_url( $permalink, PHP_URL_PATH );
}
} else {
$uri = strtolower( $wp_cache_request_uri );
}
$uri = wpsc_deep_replace( array( '..', '\\', 'index.php', ), preg_replace( '/[ <>\'\"\r\n\t\(\)]/', '', preg_replace( "/(\?.*)?(#.*)?$/", '', $uri ) ) );
$uri = wpsc_deep_replace( array( '..', '\\', 'index.php' ), preg_replace( '/[ <>\'\"\r\n\t\(\)]/', '', preg_replace( '/(\?.*)?(#.*)?$/', '', $uri ) ) );
$hostname = $WPSC_HTTP_HOST;
// Get hostname from wp options for wp-cron, wp-cli and similar requests.
if ( empty( $hostname ) && function_exists( 'get_option' ) ) {
$hostname = (string) parse_url( get_option( 'home' ), PHP_URL_HOST );
$hostname = strtolower( (string) parse_url( get_option( 'home' ), PHP_URL_HOST ) );
}
$dir = preg_replace( '/:.*$/', '', $hostname ) . $uri; // To avoid XSS attacks
if ( function_exists( "apply_filters" ) ) {
$dir = preg_replace( '/:.*$/', '', $hostname ) . $uri; // To avoid XSS attacks.
if ( function_exists( 'apply_filters' ) ) {
$dir = apply_filters( 'supercache_dir', $dir );
} else {
$dir = do_cacheaction( 'supercache_dir', $dir );
}
$dir = $cache_path . 'supercache/' . $dir . '/';
if( is_array( $cached_direct_pages ) && in_array( $_SERVER[ 'REQUEST_URI' ], $cached_direct_pages ) ) {
$dir = $cache_path . 'supercache/' . trim( $dir, '/' ) . '/';
if ( is_array( $cached_direct_pages ) && in_array( $_SERVER['REQUEST_URI'], $cached_direct_pages, true ) ) {
$dir = ABSPATH . $uri . '/';
}
$dir = str_replace( '..', '', str_replace( '//', '/', $dir ) );
wp_cache_debug( "supercache dir: $dir", 5 );
if ( $DONOTREMEMBER == 0 )
wp_cache_debug( 'supercache dir: ' . $dir, 5 );
if ( 0 === $DONOTREMEMBER ) {
$saved_supercache_dir[ $post_id ] = $dir;
}
return $dir;
}

/*
/**
* Delete (or rebuild) all the files in one directory.
* Checks if it is in the cache directory but doesn't allow files in the following directories to be deleted:
* wp-content/cache/
Expand Down