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

Merge branch 'ostatus-crop' of git@gitorious.org:~brion/statusnet/brion-fixes into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber
2010-03-19 10:27:03 -07:00
parent 08faff2278 7dd701fbb3
commit 3d1c99c258
6 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -500,7 +500,6 @@ class Ostatus_profile extends Memcached_DataObject
$shortSummary = substr($shortSummary,
0,
Notice::maxContent() - (mb_strlen($url) + 2));
$shortSummary .= '…';
$content = $shortSummary . ' ' . $url;
// We mark up the attachment link specially for the HTML output
@@ -508,12 +507,10 @@ class Ostatus_profile extends Memcached_DataObject
$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 href="' . htmlspecialchars($attachUrl) .'"'.
' class="attachment more"' .
' title="'. htmlspecialchars(_m('Show more')) . '">' .
'&#8230;' .
'</a>';
}
}