diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-06-26 18:32:18 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-06-26 18:32:18 -0700 |
| commit | a68722c9c75cd9dc8ed84e186f3b4ecc5556b1a3 (patch) | |
| tree | 564b804360160c908fe6c4469824f1ee9c194b25 /lib/router.php | |
| parent | 60b47d879781e28c0f08978bba43d5b9ad22b32a (diff) | |
| parent | 96ba25c34bc03c5b72c13241a00e467a0585cd2a (diff) | |
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
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 4 |
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]+')); |