diff options
| author | Zach Copley <zach@status.net> | 2009-10-13 11:05:39 -0700 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-10-13 11:05:39 -0700 |
| commit | 39bcd514b4cbb26b28aeff2aa65e31bd86773782 (patch) | |
| tree | 8dc1e73044870eb9010c1c30582a11d7db8c0a80 /actions | |
| parent | b4b992bca77d34b8643910e8d590b5be7fede94b (diff) | |
| parent | 659a04b556f75551548c0b2fff633b15cd114135 (diff) | |
Merge branch '0.9.x' into pluginize-twitter-bridge
* 0.9.x:
Include long-form attachment URL in notice if URL shortening is disabled.
Updated default theme to use the CSS Sprites method for common icons
Added a new plugin that requires a user to have a validated email address before being allowed to post notices
Don't trigger E_NOTICE when looking for commands in the notice input
Diffstat (limited to 'actions')
| -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)) { |