summaryrefslogtreecommitdiff
path: root/lib/router.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-05-15 23:17:57 +0000
committerZach Copley <zach@controlyourself.ca>2009-05-15 23:17:57 +0000
commit811cef10083f8b7824b2fd8140f940bf13b54c8d (patch)
tree3d403c3c7e08a79a3a87c5bafacfb3f08fcd4211 /lib/router.php
parent3f44f94c3c3f0c3d46f5025854431f0d2825bb6c (diff)
parent6c4e26fe61a3c1cada4775a42a929eb884150b2d (diff)
Merge branch '0.8.x' into fbconnect
Diffstat (limited to 'lib/router.php')
-rw-r--r--lib/router.php14
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/router.php b/lib/router.php
index 9308c818a..635e1d77e 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -151,12 +151,26 @@ class Router
$m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'),
array('q' => '.+'));
+ $m->connect('attachment/:attachment/ajax',
+ array('action' => 'attachment_ajax'),
+ array('notice' => '[0-9]+'));
+
+ $m->connect('attachment/:attachment',
+ array('action' => 'attachment'),
+ array('notice' => '[0-9]+'));
+
// notice
$m->connect('notice/new', array('action' => 'newnotice'));
$m->connect('notice/new?replyto=:replyto',
array('action' => 'newnotice'),
array('replyto' => '[A-Za-z0-9_-]+'));
+ $m->connect('notice/:notice/attachments/ajax',
+ array('action' => 'attachments_ajax'),
+ array('notice' => '[0-9]+'));
+ $m->connect('notice/:notice/attachments',
+ array('action' => 'attachments'),
+ array('notice' => '[0-9]+'));
$m->connect('notice/:notice',
array('action' => 'shownotice'),
array('notice' => '[0-9]+'));