GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Link to attachment page instead of big-ass image

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-05-01 11:26:28 +02:00
parent e4f688fcfd
commit 7aa9a69c2f
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/File.php
View File

@ -516,6 +516,11 @@ class File extends Managed_DataObject
return $filepath; return $filepath;
} }
public function getAttachmentUrl()
{
return common_local_url('attachment', array('attachment'=>$this->getID()));
}
public function getUrl($prefer_local=true) public function getUrl($prefer_local=true)
{ {
if ($prefer_local && !empty($this->filename)) { if ($prefer_local && !empty($this->filename)) {

2
lib/activityobject.php
View File

@ -491,7 +491,7 @@ class ActivityObject
$object->type = self::mimeTypeToObjectType($file->mimetype); $object->type = self::mimeTypeToObjectType($file->mimetype);
$object->id = TagURI::mint(sprintf("file:%d", $file->id)); $object->id = TagURI::mint(sprintf("file:%d", $file->id));
$object->link = common_local_url('attachment', array('attachment' => $file->id)); $object->link = $file->getAttachmentUrl();
if ($file->title) { if ($file->title) {
$object->title = $file->title; $object->title = $file->title;

4
lib/attachmentlistitem.php
View File

@ -87,8 +87,8 @@ class AttachmentListItem extends Widget
function linkAttr() { function linkAttr() {
return array('class' => 'attachment', return array('class' => 'attachment',
'href' => $this->attachment->getUrl(false), 'href' => $this->attachment->getAttachmentUrl(),
'id' => 'attachment-' . $this->attachment->id, 'id' => 'attachment-' . $this->attachment->getID(),
'title' => $this->linkTitle()); 'title' => $this->linkTitle());
} }