Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / lib / attachmentlistitem.php

diff --git a/lib/attachmentlistitem.php b/lib/attachmentlistitem.php
index 291cf685d1d442b45fee357832ddc470fefc4483..dc46a81fe731a2f9143f2db2a52b559a26090eec 100644 (file)
--- a/lib/attachmentlistitem.php
+++ b/lib/attachmentlistitem.php
@@ -171,6 +171,7 @@ class AttachmentListItem extends Widget
                     switch ($this->attachment->mimetype) {
                     case 'text/plain':
                         $this->element('div', ['class'=>'e-content plaintext'], file_get_contents($this->attachment->getPath()));
+                        break;
                     case 'text/html':
                         if (!empty($this->attachment->filename)
                                 && (GNUsocial::isAjax() || common_config('attachments', 'show_html'))) {
@@ -225,7 +226,7 @@ class AttachmentListItem extends Widget
             $scripts[] = $script;
         }
         foreach ($scripts as $script) {
-            common_log(LOG_DEBUG, $script->textContent);
+            common_debug($script->textContent);
             $script->parentNode->removeChild($script);
         }