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

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

Browse Source 
Props westonruter.
Fixes #35864.

git-svn-id: https://develop.svn.wordpress.org/trunk@36578 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling (ocean90) 2016-02-18 20:30:54 +00:00
parent 1663c24df4
commit 2d7150e40d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/formatting.php
View File

@ -374,7 +374,7 @@ function wptexturize_primes( $haystack, $needle, $prime, $open_quote, $close_quo
*/ */
function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) { function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
// Is it an opening tag or closing tag? // Is it an opening tag or closing tag?
if ( '/' !== $text[1] ) { if ( isset( $text[1] ) && '/' !== $text[1] ) {
$opening_tag = true; $opening_tag = true;
$name_offset = 1; $name_offset = 1;
} elseif ( 0 == count( $stack ) ) { } elseif ( 0 == count( $stack ) ) {

9
tests/phpunit/tests/formatting/WPTexturize.php
View File

@ -2073,6 +2073,15 @@ String with a number followed by a single quote !q1!Expendables 3!q1! vestibulum
return $this->assertLessThan( 200, $result ); return $this->assertLessThan( 200, $result );
} }
/**
* 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() { function data_whole_posts() {
require_once( DIR_TESTDATA . '/formatting/whole-posts.php' ); require_once( DIR_TESTDATA . '/formatting/whole-posts.php' );
return data_whole_posts(); return data_whole_posts();