Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 19:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

solves 2337 Smiley Pack 1.04: some smiley keywords aren't replaced correctly

Browse source
This commit is contained in:
Pascal Deklerck 2018-06-14 21:09:55 +02:00
parent ff0a4a3124
commit ce4b793acf
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Content/Smilies.php
View file

@ -145,6 +145,27 @@ class Smilies
return $params; return $params;
} }
/**
* Copied from http://php.net/manual/en/function.str-replace.php#88569
* Modified for camel caps: renamed stro_replace -> strOrigReplace
*
* When using str_replace(...), values that did not exist in the original string (but were put there by previous
* replacements) will be replaced continuously. This string replacement function is designed to replace the values
* in $search with those in $replace while not factoring in prior replacements. Note that this function will
* always look for the longest possible match first and then work its way down to individual characters.
*
* @param array $search list of strings or characters that need to be replaced
* @param array $replace list of strings or characters that will replace the corresponding values in $search
* @param string $subject the string on which this operation is being performed
*
* @return string $subject with all substrings in the $search array replaced by the values in the $replace array
*/
private static function strOrigReplace($search, $replace, $subject)
{
return strtr($subject, array_combine($search, $replace));
}
/** /**
* @brief Replaces text emoticons with graphical images * @brief Replaces text emoticons with graphical images
* *
@ -196,7 +217,7 @@ class Smilies
} }
} else { } else {
$params['string'] = preg_replace_callback('/<(3+)/', 'self::pregHeart', $params['string']); $params['string'] = preg_replace_callback('/<(3+)/', 'self::pregHeart', $params['string']);
$s = str_replace($params['texts'], $params['icons'], $params['string']); $s = self::strOrigReplace($params['texts'], $params['icons'], $params['string']);
} }
$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism', 'self::decode', $s); $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism', 'self::decode', $s);