keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11703 from MrPetovan/bug/fatal-errors 

Fix fatal errors
This commit is contained in:
Tobias Diekershoff 2022-07-03 06:32:37 +02:00 committed by GitHub
parent da7bc082b9 181c142bb4
commit e6ed8f6315
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 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;
} }
} }

4
src/Protocol/ActivityPub/Transmitter.php
View File

@ -1190,10 +1190,10 @@ class Transmitter
* *
* @param integer $item_id Item id * @param integer $item_id Item id
* @param boolean $force Force new cache entry * @param boolean $force Force new cache entry
* @return array with the activity * @return array|false activity or false on failure
* @throws \Exception * @throws \Exception
*/ */
public static function createCachedActivityFromItem(int $item_id, bool $force = false): array public static function createCachedActivityFromItem(int $item_id, bool $force = false)
{ {
$cachekey = 'APDelivery:createActivity:' . $item_id; $cachekey = 'APDelivery:createActivity:' . $item_id;