sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Themes: In get_theme_mod(), only run the sprintf() replacement on the default value if there's a string format pattern found in the value.

Browse Source 
This prevents standalone percent symbols from being stripped out, e.g. in a default value like `100%`.

Props aristath, kuus, moonomo, westonruter, davetgreen, daviedR, katielgc, noisysocks, SergeyBiryukov.
Fixes #34290.

git-svn-id: https://develop.svn.wordpress.org/trunk@46395 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-10-05 00:53:39 +00:00
parent 1be6c41ada
commit 56b6b1e803
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -934,7 +934,10 @@ function get_theme_mod( $name, $default = false ) {
} }
if ( is_string( $default ) ) { if ( is_string( $default ) ) {
$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() ); // Only run the replacement if an sprintf() string format pattern was found.
if ( preg_match( '#(?<!%)%(?:\d+\$?)?s#', $default ) ) {
$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
}
} }
/** This filter is documented in wp-includes/theme.php */ /** This filter is documented in wp-includes/theme.php */

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

@ -32,4 +32,70 @@ class Tests_Option_Theme_Mods extends WP_UnitTestCase {
$this->assertEquals( '', get_theme_mod( 'test_remove' ) ); $this->assertEquals( '', get_theme_mod( 'test_remove' ) );
} }
/**
* @ticket 34290
*
* @dataProvider data_theme_mod_default_value_with_percent_symbols
*/
function test_theme_mod_default_value_with_percent_symbols( $default, $expected ) {
$this->assertEquals( $expected, get_theme_mod( 'test_name', $default ) );
}
function data_theme_mod_default_value_with_percent_symbols() {
return array(
array(
'100%',
'100%',
),
array(
'%s',
get_template_directory_uri(),
),
array(
'%s%s',
get_template_directory_uri() . get_stylesheet_directory_uri(),
),
array(
'%1$s%s',
get_template_directory_uri() . get_template_directory_uri(),
),
array(
'%2$s%s',
get_stylesheet_directory_uri() . get_template_directory_uri(),
),
array(
'%1$s%2$s',
get_template_directory_uri() . get_stylesheet_directory_uri(),
),
array(
'%40s%40s',
get_template_directory_uri() . get_stylesheet_directory_uri(),
),
array(
'%%1',
'%%1',
),
array(
'%1%',
'%1%',
),
array(
'1%%',
'1%%',
),
array(
'%%s',
'%%s',
),
array(
'%s%',
get_template_directory_uri(),
),
array(
's%%',
's%%',
),
);
}
} }