Changeset 32850 for trunk/src/wp-includes/formatting.php

Timestamp:

06/18/2015 09:59:10 PM (11 years ago)

Author:

wonderboymusic

Message:

Since PHP 5.2.3, the htmlspecialchars() function has an optional $double_encode parameter, which we can now use. This will save us a few expensive kses/html decoding calls.

Adds unit tests.

Props miqrogroove.
Fixes #17780.

File:

• trunk/src/wp-includes/formatting.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -689 +689 @@
         }
 
-        // Handle double encoding ourselves
-        if ( $double_encode ) {
-                $string = @htmlspecialchars( $string, $quote_style, $charset );
-        } else {
-                // Decode & into &
-                $string = wp_specialchars_decode( $string, $_quote_style );
-
-                // Guarantee every &entity; is valid or re-encode the &
-                $string = wp_kses_normalize_entities( $string );
-
-                // Now re-encode everything except &entity;
-                $string = preg_split( '/(&#?x?[0-9a-z]+;)/i', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
-
-                for ( $i = 0, $c = count( $string ); $i < $c; $i += 2 ) {
-                        $string[$i] = @htmlspecialchars( $string[$i], $quote_style, $charset );
-                }
-                $string = implode( '', $string );
-        }
+        $string = @htmlspecialchars( $string, $quote_style, $charset, $double_encode );
 
         // Backwards compatibility