Merge commit 'refs/merge-requests/11' of git://gitorious.org/statusnet/gnu-social into merge-requests/11
This commit is contained in:
commit
1056348029
@ -116,7 +116,9 @@ class File extends Managed_DataObject
|
|||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if ($oembed_data === false) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
$fo = File_oembed::getKV('file_id', $this->id);
|
$fo = File_oembed::getKV('file_id', $this->id);
|
||||||
|
|
||||||
if ($fo instanceof File_oembed) {
|
if ($fo instanceof File_oembed) {
|
||||||
|
Loading…
Reference in New Issue
Block a user