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, 4 insertions, 0 deletions

diff --git a/lib/router.php b/lib/router.php
index 1f39c60dc..784ea9882 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -152,6 +152,10 @@ class Router
         $m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),
                     array('q' => '.+'));
 
+        $m->connect('attachment/:attachment',
+                    array('action' => 'attachment'),
+                    array('attachment' => '[0-9]+'));
+
         $m->connect('attachment/:attachment/ajax',
                     array('action' => 'attachment_ajax'),
                     array('attachment' => '[0-9]+'));