Changeset 36578

Timestamp:

02/18/2016 08:30:54 PM (9 years ago)

Author:

ocean90

Message:

Formatting: Avoid a PHP warning when wptexturize() is called with a trailing less-than symbol.

Props westonruter.
Fixes #35864.

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

@@ -375 +375 @@
 function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
     // Is it an opening tag or closing tag?
-    if ( '/' !== $text[1] ) {
+    if ( isset( $text[1] ) && '/' !== $text[1] ) {
         $opening_tag = true;
         $name_offset = 1;

trunk/tests/phpunit/tests/formatting/WPTexturize.php

@@ -2074 +2074 @@
     }
 
+    /**
+     * Ensure that a trailing less-than symbol doesn't cause a PHP warning.
+     *
+     * @ticket 35864
+     */
+    function test_trailing_less_than() {
+        $this->assertEquals( 'F&#8211;oo<', wptexturize( 'F--oo<', true ) );
+    }
+
     function data_whole_posts() {
         require_once( DIR_TESTDATA . '/formatting/whole-posts.php' );