Merge branch 'dev' into 'feature-like'

# 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

View File

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