friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix error / "about" is now converted to BBCode

This commit is contained in:
Michael 2018-10-03 19:00:32 +00:00
parent 221e197658
commit cbfc3d0c28
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Model/APContact.php
View File

@ -12,6 +12,7 @@ use Friendica\Protocol\ActivityPub;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\JsonLD; use Friendica\Util\JsonLD;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Content\Text\HTML;
require_once 'boot.php'; require_once 'boot.php';
@ -114,7 +115,7 @@ class APContact extends BaseObject
$apcontact['sharedinbox'] = JsonLD::fetchElement($data, 'endpoints', 'sharedInbox'); $apcontact['sharedinbox'] = JsonLD::fetchElement($data, 'endpoints', 'sharedInbox');
$apcontact['nick'] = defaults($data, 'preferredUsername', null); $apcontact['nick'] = defaults($data, 'preferredUsername', null);
$apcontact['name'] = defaults($data, 'name', $apcontact['nick']); $apcontact['name'] = defaults($data, 'name', $apcontact['nick']);
$apcontact['about'] = defaults($data, 'summary', ''); $apcontact['about'] = HTML::toBBCode(defaults($data, 'summary', ''));
$apcontact['photo'] = JsonLD::fetchElement($data, 'icon', 'url'); $apcontact['photo'] = JsonLD::fetchElement($data, 'icon', 'url');
$apcontact['alias'] = JsonLD::fetchElement($data, 'url', 'href'); $apcontact['alias'] = JsonLD::fetchElement($data, 'url', 'href');

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

@ -700,7 +700,7 @@ class Transmitter
* *
* @return object array * @return object array
*/ */
private static function createNote($item) public static function createNote($item)
{ {
if (!empty($item['title'])) { if (!empty($item['title'])) {
$type = 'Article'; $type = 'Article';