wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't update stored URLs just because we have a filename

Browse Source 
This would overwrite remote URLs with local verisons which removes source href...
The reason one might have filenames for remote URLs is that StoreRemoteMedia plugin
fetches them and uses the filename field.
This commit is contained in:
Mikael Nordfeldth 2016-01-06 19:23:38 +01:00
parent 346e34e543
commit f1c4c64cd9
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
classes/File.php
View File

@ -55,7 +55,7 @@ class File extends Managed_DataObject
'title' => array('type' => 'text', 'description' => 'title of resource when available'), 'title' => array('type' => 'text', 'description' => 'title of resource when available'),
'date' => array('type' => 'int', 'description' => 'date of resource according to http query'), 'date' => array('type' => 'int', 'description' => 'date of resource according to http query'),
'protected' => array('type' => 'int', 'description' => 'true when URL is private (needs login)'), 'protected' => array('type' => 'int', 'description' => 'true when URL is private (needs login)'),
'filename' => array('type' => 'text', 'description' => 'if a local file, name of the file'), 'filename' => array('type' => 'text', 'description' => 'if file is stored locally (too) this is the filename'),
'width' => array('type' => 'int', 'description' => 'width in pixels, if it can be described as such and data is available'), 'width' => array('type' => 'int', 'description' => 'width in pixels, if it can be described as such and data is available'),
'height' => array('type' => 'int', 'description' => 'height in pixels, if it can be described as such and data is available'), 'height' => array('type' => 'int', 'description' => 'height in pixels, if it can be described as such and data is available'),
@ -416,21 +416,11 @@ class File extends Managed_DataObject
return $filepath; return $filepath;
} }
public function getUrl() public function getUrl($prefer_local=true)
{ {
if (!empty($this->filename)) { if ($prefer_local && !empty($this->filename)) {
// A locally stored file, so let's generate a URL for our instance. // A locally stored file, so let's generate a URL for our instance.
$url = self::url($this->filename); return self::url($this->filename);
if (self::hashurl($url) !== $this->urlhash) {
// For indexing purposes, in case we do a lookup on the 'url' field.
// also we're fixing possible changes from http to https, or paths
try {
$this->updateUrl($url);
} catch (ServerException $e) {
//
}
}
return $url;
} }
// No local filename available, return the URL we have stored // No local filename available, return the URL we have stored

2
lib/attachmentlistitem.php
View File

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