eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Show more links work with AJAX-retrieved HTML

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/attachmentlistitem.php
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;

2
lib/default.php
View File

@@ -249,7 +249,7 @@ $default =
'user_quota' => 50000000,
'monthly_quota' => 15000000,
'uploads' => true,
'show_html' => false, // HTML representation for locally uploaded HTML attachments (oEmbed links etc.)
'show_html' => false, // show (filtered) text/html attachments (and oEmbed HTML etc.). Doesn't affect AJAX calls.
'show_thumbs' => true, // show thumbnails in notice lists for uploaded images, and photos and videos linked remotely that provide oEmbed info
'process_links' => true, // check linked resources for embeddable photos and videos; this will hit referenced external web sites when processing new messages.
),

4
lib/router.php
View File

@@ -218,10 +218,6 @@ class Router
array('action' => 'attachment'),
array('attachment' => '[0-9]+'));
$m->connect('attachment/:attachment/ajax',
array('action' => 'attachment_ajax'),
array('attachment' => '[0-9]+'));
$m->connect('attachment/:attachment/thumbnail',
array('action' => 'attachment_thumbnail'),
array('attachment' => '[0-9]+'));