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

Updated 'more' anchor for attachments to do an XHR GET

Browse Source 
Conflicts:

	lib/attachmentlist.php
	plugins/OStatus/classes/Ostatus_profile.php

Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
This commit is contained in:
Brion Vibber
2010-03-25 14:15:54 -07:00
parent 7fc8b6af4a
commit c11064a539
6 changed files with 140 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/OStatus/classes/Ostatus_profile.php
View File

@@ -555,9 +555,21 @@ class Ostatus_profile extends Memcached_DataObject
$shortSummary = substr($shortSummary,
0,
Notice::maxContent() - (mb_strlen($url) + 2));
$shortSummary .= '… ' . $url;
$content = $shortSummary;
$rendered = common_render_text($content);
$shortSummary .= '…';
$content = $shortSummary . ' ' . $url;
// We mark up the attachment link specially for the HTML output
// so we can fold-out the full version inline.
$attachUrl = common_local_url('attachment',
array('attachment' => $attachment->id));
$rendered = common_render_text($shortSummary) .
' ' .
'<a href="' .
htmlspecialchars($attachUrl) .
'" class="attachment more">' .
// TRANS: expansion link for too-long remote messages
htmlspecialchars(_m('more')) .
'</a>';
}
}