GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Updated some references to the long gnone "isEnclosure" function to the new "getEnclosure"

This commit is contained in:
Craig Andrews 2010-01-22 10:12:26 -05:00 committed by Zach Copley
parent b533e0e735
commit 8a3f27ac91
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/File.php
View File

@ -279,6 +279,8 @@ class File extends Memcached_DataObject
if($oembed->modified) $enclosure->modified=$oembed->modified; if($oembed->modified) $enclosure->modified=$oembed->modified;
unset($oembed->size); unset($oembed->size);
} }
} else {
return false;
} }
} }
} }

9
lib/apiaction.php
View File

@ -289,11 +289,12 @@ class ApiAction extends Action
$twitter_status['attachments'] = array(); $twitter_status['attachments'] = array();
foreach ($attachments as $attachment) { foreach ($attachments as $attachment) {
if ($attachment->isEnclosure()) { $enclosure_o=$attachment->getEnclosure();
if ($attachment_enclosure) {
$enclosure = array(); $enclosure = array();
$enclosure['url'] = $attachment->url; $enclosure['url'] = $enclosure_o->url;
$enclosure['mimetype'] = $attachment->mimetype; $enclosure['mimetype'] = $enclosure_o->mimetype;
$enclosure['size'] = $attachment->size; $enclosure['size'] = $enclosure_o->size;
$twitter_status['attachments'][] = $enclosure; $twitter_status['attachments'][] = $enclosure;
} }
} }

15
lib/util.php
View File

@ -731,20 +731,13 @@ function common_linkify($url) {
} }
if (!empty($f)) { if (!empty($f)) {
if ($f->isEnclosure()) { if ($f->getEnclosure()) {
$is_attachment = true; $is_attachment = true;
$attachment_id = $f->id; $attachment_id = $f->id;
} else {
$foe = File_oembed::staticGet('file_id', $f->id);
if (!empty($foe)) {
// if it has OEmbed info, it's an attachment, too
$is_attachment = true;
$attachment_id = $f->id;
$thumb = File_thumbnail::staticGet('file_id', $f->id); $thumb = File_thumbnail::staticGet('file_id', $f->id);
if (!empty($thumb)) { if (!empty($thumb)) {
$has_thumb = true; $has_thumb = true;
}
} }
} }
} }