Changeset 32851

Timestamp:

06/19/2015 01:52:48 AM (11 years ago)

Author:

azaozz

Message:

Fix using htmlspecialchars() whit the $double_encode parameter. PHP < 5.4 doesn't validate the entities.
Props miqrogroove. Fixes #17780.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/EscHtml.php (modified) (1 diff)
• tests/phpunit/tests/formatting/WPSpecialchars.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -687 +687 @@
         } elseif ( $quote_style === 'single' ) {
                 $quote_style = ENT_NOQUOTES;
+        }
+
+        if ( ! $double_encode ) {
+                // Guarantee every &entity; is valid, convert &garbage; into &garbage;
+                // This is required for PHP < 5.4.0 because ENT_HTML401 flag is unavailable.
+                $string = wp_kses_normalize_entities( $string );
         }
 

trunk/tests/phpunit/tests/formatting/EscHtml.php

@@ -35 +35 @@
         function test_ignores_existing_entities() {
                 $source = '& £ " &';
-                $res = '& £ " &';
+                $res = '& £ " &';
                 $this->assertEquals( $res, esc_html($source) );
         }

trunk/tests/phpunit/tests/formatting/WPSpecialchars.php

@@ -86 +86 @@
                         array(
                                 'This & that, this & that, — " " Ú   " " " " " $ ×',
-                                'This & that, this & that, — " " Ú   " " " " " $ ×',
+                                'This & that, this & that, — " " Ú   " " " " " $ ×',
                         ),
                         array(