diff options
| author | Evan Prodromou <evan@status.net> | 2009-10-13 17:21:41 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-10-13 17:21:41 -0400 |
| commit | 181de862efe2da16164daea32b74c3da8ea2ed7e (patch) | |
| tree | 8e7ebfc731f7e65f26b3b71d65c28bbe51ac2c85 /actions/newnotice.php | |
| parent | 76ac7c358a3245f4032f49152055cae94c4616ff (diff) | |
| parent | 659a04b556f75551548c0b2fff633b15cd114135 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/newnotice.php')
| -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)) { |