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

Use File->getID()

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-07-21 01:38:48 +02:00
parent e52275e37f
commit 809e2f6d07
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/Oembed/OembedPlugin.php
View File

@ -102,7 +102,7 @@ class OembedPlugin extends Plugin
array(), array(),
array('format'=>'json', 'url'=> array('format'=>'json', 'url'=>
common_local_url('attachment', common_local_url('attachment',
array('attachment' => $action->attachment->id)))), array('attachment' => $action->attachment->getID())))),
'title'=>'oEmbed'),null); 'title'=>'oEmbed'),null);
$action->element('link',array('rel'=>'alternate', $action->element('link',array('rel'=>'alternate',
'type'=>'text/xml+oembed', 'type'=>'text/xml+oembed',
@ -111,7 +111,7 @@ class OembedPlugin extends Plugin
array(), array(),
array('format'=>'xml','url'=> array('format'=>'xml','url'=>
common_local_url('attachment', common_local_url('attachment',
array('attachment' => $action->attachment->id)))), array('attachment' => $action->attachment->getID())))),
'title'=>'oEmbed'),null); 'title'=>'oEmbed'),null);
break; break;
case 'shownotice': case 'shownotice':
@ -159,9 +159,9 @@ class OembedPlugin extends Plugin
*/ */
public function onEndFileSaveNew(File $file) public function onEndFileSaveNew(File $file)
{ {
$fo = File_oembed::getKV('file_id', $file->id); $fo = File_oembed::getKV('file_id', $file->getID());
if ($fo instanceof File_oembed) { if ($fo instanceof File_oembed) {
common_log(LOG_WARNING, "Strangely, a File_oembed object exists for new file {$file->id}", __FILE__); common_log(LOG_WARNING, "Strangely, a File_oembed object exists for new file {$file->getID()}", __FILE__);
return true; return true;
} }
@ -178,14 +178,14 @@ class OembedPlugin extends Plugin
return true; return true;
} }
File_oembed::saveNew($oembed_data, $file->id); File_oembed::saveNew($oembed_data, $file->getID());
} }
return true; return true;
} }
public function onEndShowAttachmentLink(HTMLOutputter $out, File $file) public function onEndShowAttachmentLink(HTMLOutputter $out, File $file)
{ {
$oembed = File_oembed::getKV('file_id', $file->id); $oembed = File_oembed::getKV('file_id', $file->getID());
if (empty($oembed->author_name) && empty($oembed->provider)) { if (empty($oembed->author_name) && empty($oembed->provider)) {
return true; return true;
} }
@ -217,7 +217,7 @@ class OembedPlugin extends Plugin
{ {
// Never treat generic HTML links as an enclosure type! // Never treat generic HTML links as an enclosure type!
// But if we have oEmbed info, we'll consider it golden. // But if we have oEmbed info, we'll consider it golden.
$oembed = File_oembed::getKV('file_id', $file->id); $oembed = File_oembed::getKV('file_id', $file->getID());
if (!$oembed instanceof File_oembed || !in_array($oembed->type, array('photo', 'video'))) { if (!$oembed instanceof File_oembed || !in_array($oembed->type, array('photo', 'video'))) {
return true; return true;
} }