diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-25 16:08:09 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-25 16:08:09 -0700 |
| commit | e91bf2b8a99d55bf3633b80827a537efa160fc7b (patch) | |
| tree | 2d0675344f7def3329c0d53887446e1ce124ca2a | |
| parent | 013647f0ba29949e9025330b9692ad3113b1d644 (diff) | |
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.0.9.1rc1
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
| -rw-r--r-- | plugins/OStatus/classes/Ostatus_profile.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 0abc1ee19..34bff548d 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -550,8 +550,7 @@ class Ostatus_profile extends Memcached_DataObject } $shortSummary = common_shorten_links($summary); if (Notice::contentTooLong($shortSummary)) { - $url = common_shorten_url(common_local_url('attachment', - array('attachment' => $attachment->id))); + $url = common_shorten_url($sourceUrl); $shortSummary = substr($shortSummary, 0, Notice::maxContent() - (mb_strlen($url) + 2)); |