Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-30 16:55:02 +02:00
Code Issues Projects Releases Wiki Activity

smilies_init(), treat   like whitespace when converting smilies.

Browse Source 
Adds unit tests.

Props miqrogroove.
Fixes #27587.

Built from https://develop.svn.wordpress.org/trunk@28717


git-svn-id: http://core.svn.wordpress.org/trunk@28531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-06-10 02:03:14 +00:00
parent 66d2144e9a
commit 6cb51c9ceb
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/functions.php
View File

@ -2713,7 +2713,10 @@ function smilies_init() {
*/ */
krsort($wpsmiliestrans); krsort($wpsmiliestrans);
$wp_smiliessearch = '/((?:\s|^)'; $spaces = wp_spaces_regexp();
// Begin first "subpattern"
$wp_smiliessearch = '/(?<=' . $spaces . '|^)';
$subchar = ''; $subchar = '';
foreach ( (array) $wpsmiliestrans as $smiley => $img ) { foreach ( (array) $wpsmiliestrans as $smiley => $img ) {
@ -2723,7 +2726,8 @@ function smilies_init() {
// new subpattern? // new subpattern?
if ($firstchar != $subchar) { if ($firstchar != $subchar) {
if ($subchar != '') { if ($subchar != '') {
$wp_smiliessearch .= ')(?=\s|$))|((?:\s|^)'; ; $wp_smiliessearch .= ')(?=' . $spaces . '|$)'; // End previous "subpattern"
$wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern"
} }
$subchar = $firstchar; $subchar = $firstchar;
$wp_smiliessearch .= preg_quote($firstchar, '/') . '(?:'; $wp_smiliessearch .= preg_quote($firstchar, '/') . '(?:';
@ -2733,7 +2737,7 @@ function smilies_init() {
$wp_smiliessearch .= preg_quote($rest, '/'); $wp_smiliessearch .= preg_quote($rest, '/');
} }
$wp_smiliessearch .= ')(?=\s|$))/m'; $wp_smiliessearch .= ')(?=' . $spaces . '|$)/m';
} }