From: Brion Vibber <brion@pobox.com>
Date: Tue, 13 Oct 2009 16:54:57 +0000 (+0000)
Subject: Include long-form attachment URL in notice if URL shortening is disabled.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2c5aeb11b1c75ea36aaf638735b4d5b261d2770c;p=quix0rs-gnu-social.git

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.
---

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 6e3720e09e..8c0476f705 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -239,6 +239,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 (mb_strlen($content_shortened) > 140) {