Changeset 46395

Timestamp:

10/05/2019 12:53:39 AM (7 years ago)

Author:

SergeyBiryukov

Message:

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.

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.

Location:

trunk

Files:

• src/wp-includes/theme.php (modified) (1 diff)
• tests/phpunit/tests/option/themeMods.php (modified) (1 diff)

trunk/src/wp-includes/theme.php

@@ -935 +935 @@
 
         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() );
+                }
         }
 

trunk/tests/phpunit/tests/option/themeMods.php

@@ -33 +33 @@
         }
 
+        /**
+         * @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%%',
+                        ),
+                );
+        }
+
 }