content_* to common_*

This commit is contained in:
Evan Prodromou 2010-02-24 22:22:42 -05:00
parent 75cf4d4312
commit b08a527139

View File

@ -607,7 +607,7 @@ class Ostatus_profile extends Memcached_DataObject
$rendered = $this->purify($activity->object->content); $rendered = $this->purify($activity->object->content);
$content = html_entity_decode(strip_tags($rendered)); $content = html_entity_decode(strip_tags($rendered));
$shortened = content_shorten_links($content); $shortened = common_shorten_links($content);
// If it's too long, try using the summary, and make the // If it's too long, try using the summary, and make the
// HTML an attachment. // HTML an attachment.
@ -620,7 +620,7 @@ class Ostatus_profile extends Memcached_DataObject
if (empty($summary)) { if (empty($summary)) {
$summary = $content; $summary = $content;
} }
$shortSummary = content_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(common_local_url('attachment',
array('attachment' => $attachment->id))); array('attachment' => $attachment->id)));