summaryrefslogtreecommitdiff
path: root/classes/File.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@status.net>2010-11-08 15:50:06 -0800
committerBrion Vibber <brion@status.net>2010-11-08 15:50:06 -0800
commita2994e3aa232106f39a6c36c9176608467b8822e (patch)
treeec5cbb136a47f0ef945072759d0a62805a63639a /classes/File.php
parent551b196a3572ac9dabcda47abc92db201fb0e6c9 (diff)
Testing... using photo info for temp thumbnails
Diffstat (limited to 'classes/File.php')
-rw-r--r--classes/File.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/classes/File.php b/classes/File.php
index d71403e64..e3b922d13 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -352,11 +352,10 @@ class File extends Memcached_DataObject
$mimetype = substr($mimetype,0,$semicolon);
}
if(in_array($mimetype,$notEnclosureMimeTypes)){
- // Never treat HTML as an enclosure type!
- return false;
- } else {
+ // Never treat generic HTML links as an enclosure type!
+ // But if we have oEmbed info, we'll consider it golden.
$oembed = File_oembed::staticGet('file_id',$this->id);
- if($oembed){
+ if($oembed && in_array($oembed->type, array('photo', 'video'))){
$mimetype = strtolower($oembed->mimetype);
$semicolon = strpos($mimetype,';');
if($semicolon){