summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-25 14:31:22 -0700
committerBrion Vibber <brion@pobox.com>2010-03-25 14:31:22 -0700
commite174a7211df1e15e1c79415a2722651a3b885be7 (patch)
tree22d6e5c25dc86651ca6cc251c8b5a7bce3076eb1 /lib
parentc066e5285c12be5ccf243e8be79dc07977f78366 (diff)
Restore lost addition of inline HTML attachment display.
Diffstat (limited to 'lib')
-rw-r--r--lib/attachmentlist.php9
1 files changed, 9 insertions, 0 deletions
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();
}