From eced539d8b9b60f46e7fbe6808ca723dd43e0bc1 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Fri, 27 Mar 2015 02:11:45 +0000 Subject: [PATCH] Emoji: [31864] changed emoji image's inline style from `height` to `max-height`. Unfortunately, anything using `feedparser.py` (for example, NewsBlur) strips out `max-height`, which gives us massive emoji in feeds. This re-adds `height`, and also reminds us why we can't have nice things. See #31719. git-svn-id: https://develop.svn.wordpress.org/trunk@31909 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/formatting.php | 6 +++--- tests/phpunit/tests/formatting/Smilies.php | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php index e08466d2ac..4356b8b328 100644 --- a/src/wp-includes/formatting.php +++ b/src/wp-includes/formatting.php @@ -2109,7 +2109,7 @@ function translate_smiley( $matches ) { */ $src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() ); - return sprintf( '%s', esc_url( $src_url ), esc_attr( $smiley ) ); + return sprintf( '%s', esc_url( $src_url ), esc_attr( $smiley ) ); } /** @@ -4275,7 +4275,7 @@ function wp_staticize_emoji( $text ) { $chars = str_replace( array( '&#x', ';'), '', $flag ); list( $char1, $char2 ) = str_split( $chars, 5 ); - $entity = ''; + $entity = ''; $content = str_replace( $flag, $entity, $content ); } @@ -4290,7 +4290,7 @@ function wp_staticize_emoji( $text ) { if ( ! empty( $matches[1] ) ) { foreach ( $matches[1] as $emoji ) { $char = str_replace( array( '&#x', ';'), '', $emoji ); - $entity = ''; + $entity = ''; $content = str_replace( $emoji, $entity, $content ); } diff --git a/tests/phpunit/tests/formatting/Smilies.php b/tests/phpunit/tests/formatting/Smilies.php index 43578a01f8..0bce4766ee 100644 --- a/tests/phpunit/tests/formatting/Smilies.php +++ b/tests/phpunit/tests/formatting/Smilies.php @@ -16,11 +16,11 @@ class Tests_Formatting_Smilies extends WP_UnitTestCase { return array ( array ( 'Lorem ipsum dolor sit amet mauris ;-) Praesent gravida sodales. :lol: Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, :eek: mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, :mrgreen: tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus :?:', - "Lorem ipsum dolor sit amet mauris \xf0\x9f\x98\x89 Praesent gravida sodales. \xf0\x9f\x98\x84 Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, \xf0\x9f\x98\xaf mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, \":mrgreen:\" tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus \xe2\x9d\x93" + "Lorem ipsum dolor sit amet mauris \xf0\x9f\x98\x89 Praesent gravida sodales. \xf0\x9f\x98\x84 Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, \xf0\x9f\x98\xaf mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, \":mrgreen:\" tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus \xe2\x9d\x93" ), array ( 'Welcome to the jungle! We got fun n games! :) We got everything you want 8-) Honey we know the names :)', - "Welcome to the jungle! We got fun n games! \":)\" We got everything you want \xf0\x9f\x98\x8e Honey we know the names \":)\"" + "Welcome to the jungle! We got fun n games! \":)\" We got everything you want \xf0\x9f\x98\x8e Honey we know the names \":)\"" ), array ( "a little bit of this\na little bit:other: of that :D\n:D a little bit of good\nyeah with a little bit of bad8O", @@ -72,15 +72,15 @@ class Tests_Formatting_Smilies extends WP_UnitTestCase { return array ( array ( 'Peter Brian Gabriel (born 13 February 1950) is a British singer, musician, and songwriter who rose to fame as the lead vocalist and flautist of the progressive rock group Genesis. :monkey:', - 'Peter Brian Gabriel (born 13 February 1950) is a British singer, musician, and songwriter who rose to fame as the lead vocalist and flautist of the progressive rock group Genesis. :monkey:' + 'Peter Brian Gabriel (born 13 February 1950) is a British singer, musician, and songwriter who rose to fame as the lead vocalist and flautist of the progressive rock group Genesis. :monkey:' ), array ( 'Star Wars Jedi Knight :arrow: Jedi Academy is a first and third-person shooter action game set in the Star Wars universe. It was developed by Raven Software and published, distributed and marketed by LucasArts in North America and by Activision in the rest of the world. :nervou:', - 'Star Wars Jedi Knight :arrow: Jedi Academy is a first and third-person shooter action game set in the Star Wars universe. It was developed by Raven Software and published, distributed and marketed by LucasArts in North America and by Activision in the rest of the world. :nervou:' + 'Star Wars Jedi Knight :arrow: Jedi Academy is a first and third-person shooter action game set in the Star Wars universe. It was developed by Raven Software and published, distributed and marketed by LucasArts in North America and by Activision in the rest of the world. :nervou:' ), array ( ':arrow: monkey: Lorem ipsum dolor sit amet enim. Etiam ullam :PP
corper. Suspendisse a pellentesque dui, non felis. :arrow: :arrow', - ':arrow: monkey: Lorem ipsum dolor sit amet enim. Etiam ullam :PP
corper. Suspendisse a pellentesque dui, non felis. :arrow: :arrow' + ':arrow: monkey: Lorem ipsum dolor sit amet enim. Etiam ullam :PP
corper. Suspendisse a pellentesque dui, non felis. :arrow: :arrow' ), ); } @@ -228,11 +228,11 @@ class Tests_Formatting_Smilies extends WP_UnitTestCase { ), array ( '8O :) additional text here :)', - '8O :) additional text here :)' + '8O :) additional text here :)' ), array ( ':) :) :) :)', - ':) :) :) :)' + ':) :) :) :)' ), ); }