vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Multisite: Ensure that switching sites resets the current theme directory globals.

Browse Source 
The globals introduced in [56635] to cache the current theme directories in memory were not considering switching sites in a multisite network. This changeset addresses the bug including test coverage.

Props codex-m, jeremyfelt.
Fixes #59677.
See #18298.


git-svn-id: https://develop.svn.wordpress.org/trunk@56974 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Felix Arntz
2023-10-19 19:07:13 +00:00
parent 545748c9d2
commit 69a56e30f9
2 changed files with 108 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
tests/phpunit/tests/theme.php
View File

@@ -1058,6 +1058,102 @@ class Tests_Theme extends WP_UnitTestCase {
);
}
/**
* Tests whether a switched site retrieves the correct stylesheet directory.
*
* @ticket 59677
* @group ms-required
*
* @covers ::get_stylesheet_directory
*/
public function test_get_stylesheet_directory_with_switched_site() {
$blog_id = self::factory()->blog->create();
update_blog_option( $blog_id, 'stylesheet', 'switched_stylesheet' );
// Prime global storage with the current site's data.
get_stylesheet_directory();
switch_to_blog( $blog_id );
$switched_stylesheet = get_stylesheet_directory();
restore_current_blog();
$this->assertSame( WP_CONTENT_DIR . '/themes/switched_stylesheet', $switched_stylesheet );
}
/**
* Tests whether a switched site retrieves the correct template directory.
*
* @ticket 59677
* @group ms-required
*
* @covers ::get_template_directory
*/
public function test_get_template_directory_with_switched_site() {
$blog_id = self::factory()->blog->create();
update_blog_option( $blog_id, 'template', 'switched_template' );
// Prime global storage with the current site's data.
get_template_directory();
switch_to_blog( $blog_id );
$switched_template = get_template_directory();
restore_current_blog();
$this->assertSame( WP_CONTENT_DIR . '/themes/switched_template', $switched_template );
}
/**
* Tests whether a restored site retrieves the correct stylesheet directory.
*
* @ticket 59677
* @group ms-required
*
* @covers ::get_stylesheet_directory
*/
public function test_get_stylesheet_directory_with_restored_site() {
$blog_id = self::factory()->blog->create();
update_option( 'stylesheet', 'original_stylesheet' );
update_blog_option( $blog_id, 'stylesheet', 'switched_stylesheet' );
$stylesheet = get_stylesheet_directory();
switch_to_blog( $blog_id );
// Prime global storage with the restored site's data.
get_stylesheet_directory();
restore_current_blog();
$this->assertSame( WP_CONTENT_DIR . '/themes/original_stylesheet', $stylesheet );
}
/**
* Tests whether a restored site retrieves the correct template directory.
*
* @ticket 59677
* @group ms-required
*
* @covers ::get_template_directory
*/
public function test_get_template_directory_with_restored_site() {
$blog_id = self::factory()->blog->create();
update_option( 'template', 'original_template' );
update_blog_option( $blog_id, 'template', 'switched_template' );
$template = get_template_directory();
switch_to_blog( $blog_id );
// Prime global storage with the switched site's data.
get_template_directory();
restore_current_blog();
$this->assertSame( WP_CONTENT_DIR . '/themes/original_template', $template );
}
/**
* Helper function to ensure that a block theme is available and active.
*/