GNUsocial/gnu-social-v2-archive-activitypub-plugin
Archived
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'feature-like'

Browse Source 
# Conflicts:
#   ActivityPubPlugin.php
#   classes/Activitypub_attachment.php
#   classes/Activitypub_notice.php
This commit is contained in:
Diogo Cordeiro 2018-05-05 23:30:45 +00:00
commit 35077111f4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Activitypub_attachment.php
View File

@ -45,7 +45,7 @@ class Activitypub_attachment extends Managed_DataObject
'id' => $attachment->getID (), 'id' => $attachment->getID (),
'mimetype' => $attachment->mimetype, 'mimetype' => $attachment->mimetype,
'url' => $attachment->getUrl (), 'url' => $attachment->getUrl (),
'size' => intval($attachment->size), 'size' => intval($attachment->size), // $attachment->getSize ()
'title' => $attachment->getTitle (), 'title' => $attachment->getTitle (),
'meta' => null 'meta' => null
]; ];