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

Merge pull request #11629 from annando/issue-11625 

Issue 11625: Don't parse the title through Markdown
This commit is contained in:
Tobias Diekershoff 2022-06-11 09:14:13 +02:00 committed by GitHub
parent 3394b65c60 d7d8a6ab55
commit 5bd3f62665
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -608,7 +608,7 @@ class Processor
private static function processContent($activity, $item) private static function processContent($activity, $item)
{ {
if (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/markdown')) { if (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/markdown')) {
$item['title'] = Markdown::toBBCode($activity['name']); $item['title'] = strip_tags($activity['name']);
$content = Markdown::toBBCode($activity['content']); $content = Markdown::toBBCode($activity['content']);
} elseif (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/bbcode')) { } elseif (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/bbcode')) {
$item['title'] = $activity['name']; $item['title'] = $activity['name'];
@ -619,6 +619,8 @@ class Processor
$content = HTML::toBBCode($activity['content']); $content = HTML::toBBCode($activity['content']);
} }
$item['title'] = trim(BBCode::toPlaintext($item['title']));
if (!empty($activity['languages'])) { if (!empty($activity['languages'])) {
$item['language'] = self::processLanguages($activity['languages']); $item['language'] = self::processLanguages($activity['languages']);
} }