Include long-form attachment URL in notice if URL shortening is disabled.

Previously, the attachment URL would simply be dropped when shortening returned false instead of a short URL... the attachment was present if you clicked through to notice details but didn't appear in the timeline, making it nigh-impossible to see the attachment.
This commit is contained in:
Brion Vibber 2009-10-13 16:54:57 +00:00
parent 3727b17c39
commit ed1ff81e94

View File

@ -239,6 +239,10 @@ class NewnoticeAction extends Action
$this->maybeAddRedir($fileRecord->id, $fileurl); $this->maybeAddRedir($fileRecord->id, $fileurl);
$short_fileurl = common_shorten_url($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; $content_shortened .= ' ' . $short_fileurl;
if (mb_strlen($content_shortened) > 140) { if (mb_strlen($content_shortened) > 140) {