Show more links work with AJAX-retrieved HTML

Attachment_ajaxAction has been removed since AttachmentAction handles
AJAX calls splendidly.
This commit is contained in:
Mikael Nordfeldth
2014-05-19 00:54:43 +02:00
parent 202eaa53e0
commit d7c40e77b2
6 changed files with 6 additions and 87 deletions

View File

@@ -159,7 +159,8 @@ class AttachmentListItem extends Widget
break;
case 'text/html':
if (!empty($this->attachment->filename) && common_config('attachments', 'show_html')) {
if (!empty($this->attachment->filename)
&& (StatusNet::isAjax() || common_config('attachments', 'show_html'))) {
// Locally-uploaded HTML. Scrub and display inline.
$this->showHtmlFile($this->attachment);
break;