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.

Conflicts:

	plugins/OStatus/classes/Ostatus_profile.php
This commit is contained in:
Brion Vibber 2010-03-25 16:08:09 -07:00
parent 013647f0ba
commit e91bf2b8a9

View File

@ -550,8 +550,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));