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

Themes: Make sure get_theme_mods() always returns an array.

Browse Source 
This avoids a "Cannot access offset of type string on string" fatal error in `set_theme_mod()` on PHP 8 if the `theme_mods_$theme_slug` option has an incorrect value, e.g. an empty string instead of an array.

With this change, `set_theme_mod()` should be able to resolve the issue by saving a correct value.

Follow-up to [15736], [15739], [30672], [32629], [32632].

Props xknown.
See #51423.

git-svn-id: https://develop.svn.wordpress.org/trunk@51524 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2021-08-01 14:54:52 +00:00
parent ac47170bb5
commit 2ba4a4817a
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wp-includes/theme.php
View File

@@ -966,23 +966,31 @@ function validate_theme_requirements( $stylesheet ) {
* Retrieves all theme modifications.
*
* @since 3.1.0
* @since 5.9.0 The return value is always an array.
*
* @return array|void Theme modifications.
* @return array Theme modifications.
*/
function get_theme_mods() {
$theme_slug = get_option( 'stylesheet' );
$mods = get_option( "theme_mods_$theme_slug" );
if ( false === $mods ) {
$theme_name = get_option( 'current_theme' );
if ( false === $theme_name ) {
$theme_name = wp_get_theme()->get( 'Name' );
}
$mods = get_option( "mods_$theme_name" ); // Deprecated location.
if ( is_admin() && false !== $mods ) {
update_option( "theme_mods_$theme_slug", $mods );
delete_option( "mods_$theme_name" );
}
}
if ( ! is_array( $mods ) ) {
$mods = array();
}
return $mods;
}

9
tests/phpunit/tests/option/themeMods.php
View File

@@ -19,6 +19,15 @@ class Tests_Option_Theme_Mods extends WP_UnitTestCase {
$this->assertSame( $expected, get_theme_mod( 'test_name' ) );
}
/**
* @ticket 51423
*/
function test_theme_mod_set_with_invalid_theme_mods_option() {
$theme_slug = get_option( 'stylesheet' );
update_option( 'theme_mods_' . $theme_slug, '' );
self::test_theme_mod_set();
}
function test_theme_mod_update() {
set_theme_mod( 'test_update', 'first_value' );
$expected = 'updated_value';