summaryrefslogtreecommitdiff
path: root/lib/attachmentlist.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@status.net>2010-11-12 14:03:57 -0800
committerBrion Vibber <brion@status.net>2010-11-12 14:03:57 -0800
commit2c33fdd2fb98c37798a80a8600798caa9dabcb0e (patch)
tree7a6c9b400ce28b1ae789dbb9e2970e5028ec7d5f /lib/attachmentlist.php
parent2c4313467f07cae059798ac500ec2a1c31953877 (diff)
Only use saved thumbnails for notice list attachment thumbs -- don't attempt to search enclosures for photo types. We now save thumbs directly for oEmbed photos that don't list a separate thumb entry (like Flickr), so it's not needed. Keeps things cleaner :D
Diffstat (limited to 'lib/attachmentlist.php')
-rw-r--r--lib/attachmentlist.php47
1 files changed, 11 insertions, 36 deletions
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 6e127af86..0d56791d7 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -218,55 +218,30 @@ class AttachmentListItem extends Widget
function showRepresentation() {
$thumb = $this->getThumbInfo();
if ($thumb) {
- $thumb = $this->sizeThumb($thumb);
$this->out->element('img', array('alt' => '', 'src' => $thumb->url, 'width' => $thumb->width, 'height' => $thumb->height));
}
}
/**
- * Pull a thumbnail image reference for the given file.
- * In order we check:
- * 1) file_thumbnail table (thumbnails found via oEmbed)
- * 2) image URL from direct dereference or oEmbed 'photo' type URL
- * 3) ???
+ * Pull a thumbnail image reference for the given file, and if necessary
+ * resize it to match currently thumbnail size settings.
*
- * @return mixed object with (url, width, height) properties, or false
+ * @return File_Thumbnail or false/null
*/
function getThumbInfo()
{
$thumbnail = File_thumbnail::staticGet('file_id', $this->attachment->id);
if ($thumbnail) {
- return $thumbnail;
- }
- $enc = $this->attachment->getEnclosure();
- if ($enc) {
- switch ($enc->mimetype) {
- case 'image/gif':
- case 'image/png':
- case 'image/jpg':
- case 'image/jpeg':
- $thumb = (object)array();
- $thumb->url = $enc->url;
- // @fixme use the given width/height aspect
- $thumb->width = common_config('attachments', 'thumb_width');
- $thumb->height = common_config('attachments', 'thumb_height');
- return $thumb;
+ $maxWidth = common_config('attachments', 'thumb_width');
+ $maxHeight = common_config('attachments', 'thumb_height');
+ if ($thumbnail->width > $maxWidth) {
+ $thumb = clone($thumbnail);
+ $thumb->width = $maxWidth;
+ $thumb->height = intval($thumbnail->height * $maxWidth / $thumbnail->width);
+ return $thumb;
}
}
- return false;
- }
-
- function sizeThumb($thumbnail) {
- $maxWidth = 100;
- $maxHeight = 75;
- if ($thumbnail->width > $maxWidth) {
- $thumb = clone($thumbnail);
- $thumb->width = $maxWidth;
- $thumb->height = intval($thumbnail->height * $maxWidth / $thumbnail->width);
- return $thumb;
- } else {
- return $thumbnail;
- }
+ return $thumbnail;
}
/**