friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-12 12:49:39 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Rename Smilies::pregHeart to better match its purpose

Browse source 
- Fix "Argument 1 passed to Friendica\Content\Smilies::pregHeart() must be of the type string, array given" error
This commit is contained in:
Hypolite Petovan 2022-07-02 22:14:20 -04:00
parent da7bc082b9
commit e6feed65bf
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Content/Smilies.php
View file

@ -233,7 +233,7 @@ class Smilies
$smilies = $cleaned; $smilies = $cleaned;
} }
$text = preg_replace_callback('/<(3+)/', 'self::pregHeart', $text); $text = preg_replace_callback('/<(3+)/', 'self::heartReplaceCallback', $text);
$text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text); $text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text);
$text = preg_replace_callback('/<(code)>(.*?)<\/code>/ism', 'self::decode', $text); $text = preg_replace_callback('/<(code)>(.*?)<\/code>/ism', 'self::decode', $text);
@ -269,22 +269,20 @@ class Smilies
/** /**
* expand <3333 to the correct number of hearts * expand <3333 to the correct number of hearts
* *
* @param string $x string * @param array $matches
* @return string HTML Output * @return string HTML Output
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
private static function pregHeart(string $x): string private static function heartReplaceCallback(array $matches): string
{ {
if (strlen($x[1]) == 1) { if (strlen($matches[1]) == 1) {
return $x[0]; return $matches[0];
} }
$t = ''; $t = '';
for ($cnt = 0; $cnt < strlen($x[1]); $cnt ++) { for ($cnt = 0; $cnt < strlen($matches[1]); $cnt ++) {
$t .= '❤'; $t .= '❤';
} }
$r = str_replace($x[0], $t, $x[0]); return str_replace($matches[0], $t, $matches[0]);
return $r;
} }
} }