From 883f7a6c0b1464f6723e51bf99d06641a612f968 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Mon, 8 Nov 2010 13:27:54 -0800
Subject: Avoid marking files as attachments that are not locally uploaded,
 unless they're really oembedable. HTML-y things now excluded properly.

---
 classes/File.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'classes/File.php')

diff --git a/classes/File.php b/classes/File.php
index 16e00024a..d71403e64 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -352,6 +352,9 @@ 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 {
                 $oembed = File_oembed::staticGet('file_id',$this->id);
                 if($oembed){
                     $mimetype = strtolower($oembed->mimetype);
-- 
cgit v1.2.3-54-g00ecf