Skip to content

Fix: use home_url() instead of site_url() in get_current_url_supercache_dir #1024

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

Draft
kraftbj wants to merge 5 commits into
base: trunk
Choose a base branch
from
Draft

Fix: use home_url() instead of site_url() in get_current_url_supercache_dir #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65fb755
fix: use home_url() instead of site_url() in get_current_url_supercac…
stodorovic Apr 7, 2026
a4eed5e
fix: split isset() to single argument per call
stodorovic Apr 7, 2026
0934bab
fix: address PHPCS errors in get_current_url_supercache_dir
stodorovic Apr 7, 2026
52fa56c
fix: guard against get_permalink() returning false
stodorovic Apr 7, 2026
fe6d0b2
fix: add phpcs ignore for pre-existing DONOTREMEMBER variable
kraftbj Apr 7, 2026
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
2 changes: 1 addition & 1 deletion plugins/multisite.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function wp_super_cache_blogs_field( $name, $blog_id ) {

$blog_id = (int) $blog_id;

if ( isset( $_GET['id'], $_GET['action'], $_GET['_wpnonce'] )
if ( isset( $_GET['id'] ) && isset( $_GET['action'] ) && isset( $_GET['_wpnonce'] )
&& $blog_id === filter_input( INPUT_GET, 'id', FILTER_VALIDATE_INT )
&& wp_verify_nonce( $_GET['_wpnonce'], 'wp-cache' . $blog_id )
) {
Expand Down
23 changes: 13 additions & 10 deletions wp-cache-phase2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ 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; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
static $saved_supercache_dir = array();

if ( isset( $saved_supercache_dir[ $post_id ] ) ) {
Expand All @@ -831,14 +831,18 @@ function get_current_url_supercache_dir( $post_id = 0 ) {

$DONOTREMEMBER = 0;
if ( $post_id != 0 ) {
$site_url = site_url();
$home_url = home_url();
$permalink = get_permalink( $post_id );
if ( ! str_contains( $permalink, $site_url ) ) {
if ( ! is_string( $permalink ) ) {
$DONOTREMEMBER = 1; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
wp_cache_debug( "get_current_url_supercache_dir: WARNING! get_permalink($post_id) did not return a valid string. Using front page.", 1 );
$uri = '';
} elseif ( ! str_contains( $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
* Sometimes home_url doesn't return the home url. See https://wordpress.org/support/topic/wp-super-cache-not-refreshing-post-after-comments-made
*/
$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] ) {
wp_cache_debug( "get_current_url_supercache_dir: WARNING! SERVER_NAME ({$WPSC_HTTP_HOST}) not found in permalink ($permalink).", 1 );
Expand All @@ -853,10 +857,9 @@ function get_current_url_supercache_dir( $post_id = 0 ) {
$uri = '';
}
} else {
$uri = str_replace( $site_url, '', $permalink );
$home_path = $wp_cache_home_path ?? '';
if ( $home_path !== '' && ! str_starts_with( $uri, $home_path ) ) {
$uri = rtrim( $home_path, '/' ) . $uri;
$uri = wp_parse_url( $permalink, PHP_URL_PATH );
if ( ! is_string( $uri ) ) {
$uri = '';
}
}
} else {
Expand All @@ -882,7 +885,7 @@ function ( $matches ) {
$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 ) ) {
if ( is_array( $cached_direct_pages ) && isset( $_SERVER['REQUEST_URI'] ) && in_array( $_SERVER['REQUEST_URI'], $cached_direct_pages, true ) ) {
$dir = ABSPATH . $uri . '/';
Comment thread
kraftbj marked this conversation as resolved.
}
$dir = str_replace( '..', '', str_replace( '//', '/', $dir ) );
Expand Down
Loading