Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile
This commit is contained in:
commit
9fb8d4e9bb
|
@ -240,6 +240,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 (Notice::contentTooLong($content_shortened)) {
|
if (Notice::contentTooLong($content_shortened)) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user