Merge branch 'attachment-fixup' into 0.8.x

* attachment-fixup:
  Added readonly flag to FileAction just in case
  Make shorturls in notice content point to AttachmentAction urls
  Add attachment action back into router

1 files changed, 10 insertions, 1 deletions

diff --git a/actions/attachment.php b/actions/attachment.php
index e4dc0e054..ee4cd9640 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -111,7 +111,16 @@ class AttachmentAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        $this->showPage();
+
+        if (empty($this->attachment->filename)) {
+
+            // if it's not a local file, gtfo
+
+            common_redirect($this->attachment->url, 303);
+
+        } else {
+            $this->showPage();
+        }
     }
 
     /**