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

File::processNew now static and always throws exception on failure

Browse Source
This commit is contained in:
Mikael Nordfeldth
2014-06-02 02:08:48 +02:00
parent d6f52f5939
commit db443e9374
5 changed files with 68 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/Bookmark/actions/bookmarkforurl.php
View File

@@ -78,17 +78,19 @@ class BookmarkforurlAction extends Action
throw new ClientException(_('Invalid URL.'), 400);
}
$f = File::getKV('url', $this->url);
if (empty($url)) {
$f = File::processNew($this->url);
try {
// processNew will first try to fetch a locally stored File entry
$f = File::processNew($this->url);
} catch (ServerException $e) {
$f = null;
}
// How about now?
if (!empty($f)) {
if ($f instanceof File) {
// FIXME: Use some File metadata Event instead
$this->oembed = File_oembed::getKV('file_id', $f->id);
if (!empty($this->oembed)) {
if ($this->oembed instanceof File_oembed) {
$this->title = $this->oembed->title;
}
$this->thumbnail = File_thumbnail::getKV('file_id', $f->id);