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
parent 26fdf0c9d2
commit 672126968f
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

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

9
lib/api.php
View File

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

15
lib/util.php
View File

@ -596,20 +596,13 @@ function common_linkify($url) {
}
if (!empty($f)) {
if ($f->isEnclosure()) {
if ($f->getEnclosure()) {
$is_attachment = true;
$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);
if (!empty($thumb)) {
$has_thumb = true;
}
$thumb = File_thumbnail::staticGet('file_id', $f->id);
if (!empty($thumb)) {
$has_thumb = true;
}
}
}