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

Tweak to OStatus long message cropping: use original source notice URL for the link in the text version, don't shorten the link for the HTML so we can append params to it in JS.

Browse Source
This commit is contained in:
Brion Vibber 2010-03-17 14:16:43 -07:00
parent f797a10256
commit a9c731798e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,8 +542,7 @@ class Ostatus_profile extends Memcached_DataObject
} }
$shortSummary = common_shorten_links($summary); $shortSummary = common_shorten_links($summary);
if (Notice::contentTooLong($shortSummary)) { if (Notice::contentTooLong($shortSummary)) {
$url = common_shorten_url(common_local_url('attachment', $url = common_shorten_url($sourceUrl);
array('attachment' => $attachment->id)));
$shortSummary = substr($shortSummary, $shortSummary = substr($shortSummary,
0, 0,
Notice::maxContent() - (mb_strlen($url) + 2)); Notice::maxContent() - (mb_strlen($url) + 2));
@ -552,10 +551,12 @@ class Ostatus_profile extends Memcached_DataObject
// We mark up the attachment link specially for the HTML output // We mark up the attachment link specially for the HTML output
// so we can fold-out the full version inline. // so we can fold-out the full version inline.
$attachUrl = common_local_url('attachment',
array('attachment' => $attachment->id));
$rendered = common_render_text($shortSummary) . $rendered = common_render_text($shortSummary) .
' ' . ' ' .
'<a href="' . '<a href="' .
htmlspecialchars($url) . htmlspecialchars($attachUrl) .
'" class="attachment more">' . '" class="attachment more">' .
// TRANS: expansion link for too-long remote messages // TRANS: expansion link for too-long remote messages
htmlspecialchars(_m('(more)')) . htmlspecialchars(_m('(more)')) .