From e174a7211df1e15e1c79415a2722651a3b885be7 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 25 Mar 2010 14:31:22 -0700
Subject: Restore lost addition of inline HTML attachment display.

---
 lib/attachmentlist.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index c6261dea5..43f836e15 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -330,6 +330,15 @@ class Attachment extends AttachmentListItem
                     $this->out->element('param', array('name' => 'autoStart', 'value' => 1));
                     $this->out->elementEnd('object');
                     break;
+
+                case 'text/html':
+                    if ($this->attachment->filename) {
+                        // Locally-uploaded HTML. Scrub and display inline.
+                        $this->showHtmlFile($this->attachment);
+                        break;
+                    }
+                    // Fall through to default.
+
                 default:
                     $this->showFallback();
                 }
-- 
cgit v1.2.3-54-g00ecf