diff options
author | Evan Prodromou <evan@status.net> | 2010-03-25 17:24:10 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-03-25 17:24:10 -0400 |
commit | cbf321eeb371fecdb069a33301629a6d045425f1 (patch) | |
tree | eb44b8419e74d5653d2fa178e84f46e0b01401bf /plugins/OStatus | |
parent | 9c63ae6e443e7b23f64e31617a1762393473509a (diff) | |
parent | c066e5285c12be5ccf243e8be79dc07977f78366 (diff) |
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'plugins/OStatus')
-rw-r--r-- | plugins/OStatus/classes/Ostatus_profile.php | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index c7e3b0509..e5210cda1 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -555,9 +555,18 @@ 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); + $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"' . + ' title="'. htmlspecialchars(_m('Show more')) . '">' . + '…' . + '</a>'; } } |