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

[quix0rs-gnu-social.git] / plugins / OStatus / classes / Ostatus_profile.php

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index d37596d54268811bc000098f5ae5e2b1c93a0831..95c002b015cc350a1e0d3f3141a7e6b6ec9de69e 100644 (file)
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -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>';
             }
         }