Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-07 22:24:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

Browse source
This commit is contained in:
Michael 2018-09-15 20:49:46 +00:00
commit e45206ae5d
17 changed files with 81 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Protocol/PortableContact.php
View file

@ -1157,9 +1157,9 @@ class PortableContact
if (isset($data['version'])) {
$platform = "Mastodon";
$version = $data['version'];
$site_name = $data['title'];
$info = $data['description'];
$version = defaults($data, 'version', '');
$site_name = defaults($data, 'title', '');
$info = defaults($data, 'description', '');
$network = Protocol::OSTATUS;
}