eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Return dynamically generated URLs for thumbnails for all locally stored entries

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-01-06 19:06:29 +01:00
parent 4352d1739d
commit 346e34e543
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
classes/File_thumbnail.php
View File

@ -38,7 +38,7 @@ class File_thumbnail extends Managed_DataObject
return array( return array(
'fields' => array( 'fields' => array(
'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'thumbnail for what URL/file'), 'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'thumbnail for what URL/file'),
'url' => array('type' => 'text', 'not null' => false, 'description' => 'URL of thumbnail'), 'url' => array('type' => 'text', 'description' => 'URL of thumbnail'),
'filename' => array('type' => 'text', 'description' => 'if stored locally, filename is put here'), 'filename' => array('type' => 'text', 'description' => 'if stored locally, filename is put here'),
'width' => array('type' => 'int', 'description' => 'width of thumbnail'), 'width' => array('type' => 'int', 'description' => 'width of thumbnail'),
'height' => array('type' => 'int', 'description' => 'height of thumbnail'), 'height' => array('type' => 'int', 'description' => 'height of thumbnail'),
@ -134,12 +134,12 @@ class File_thumbnail extends Managed_DataObject
public function getUrl() public function getUrl()
{ {
if (!empty($this->getFile()->filename)) { if (!empty($this->filename) || $this->getFile()->isLocal()) {
// A locally stored File, so we can dynamically generate a URL. // A locally stored File, so we can dynamically generate a URL.
if (!empty($this->url)) { if (!empty($this->url)) {
// Let's just clear this field as there is no point in having it for local files. // Let's just clear this field as there is no point in having it for local files.
$orig = clone($this); $orig = clone($this);
$this->url = null; $this->url = '';
$this->update($orig); $this->update($orig);
} }
$url = common_local_url('attachment_thumbnail', array('attachment'=>$this->file_id)); $url = common_local_url('attachment_thumbnail', array('attachment'=>$this->file_id));
@ -149,7 +149,7 @@ class File_thumbnail extends Managed_DataObject
return $url . http_build_query(array('w'=>$this->width, 'h'=>$this->height)); return $url . http_build_query(array('w'=>$this->width, 'h'=>$this->height));
} }
// No local filename available, return the URL we have stored // No local filename available, return the remote URL we have stored
return $this->url; return $this->url;
} }
@ -163,6 +163,9 @@ class File_thumbnail extends Managed_DataObject
return $this->width; return $this->width;
} }
/**
* @throws UseFileAsThumbnailException from File_thumbnail->getUrl() for stuff like animated GIFs
*/
public function getHtmlAttrs(array $orig=array(), $overwrite=true) public function getHtmlAttrs(array $orig=array(), $overwrite=true)
{ {
$attrs = [ $attrs = [