Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile

This commit is contained in:
Sarven Capadisli 2009-10-13 21:15:30 +00:00
commit 9fb8d4e9bb
1 changed files with 4 additions and 0 deletions

View File

@ -240,6 +240,10 @@ class NewnoticeAction extends Action
$this->maybeAddRedir($fileRecord->id, $fileurl);
$short_fileurl = common_shorten_url($fileurl);
if (!$short_fileurl) {
// todo -- Consider forcing default shortener if none selected?
$short_fileurl = $fileurl;
}
$content_shortened .= ' ' . $short_fileurl;
if (Notice::contentTooLong($content_shortened)) {