diff options
| author | Sarven Capadisli <csarven@status.net> | 2009-10-13 21:15:30 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2009-10-13 21:15:30 +0000 |
| commit | 9fb8d4e9bb74025711792d35f683ca2529732764 (patch) | |
| tree | 4671681115eab65170d24e2fa919950cb861e435 | |
| parent | e6c4dceb5a39b9f834b37a0d68ea9aa018e15b74 (diff) | |
| parent | 659a04b556f75551548c0b2fff633b15cd114135 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile
| -rw-r--r-- | actions/newnotice.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actions/newnotice.php b/actions/newnotice.php index d5b0332f4..9ee031f93 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -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)) { |