diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-26 23:24:01 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-26 23:24:01 -0400 |
commit | 648d967226f3b47aa6237d2be9d1a82df4f78402 (patch) | |
tree | 2592f56f0073ee21ce320a158233fdb1bd2710c4 /lib/router.php | |
parent | 6335c9cf59b384da24506c4a3f799315fbbc4b09 (diff) | |
parent | 0b53a820c2b4224b66b2a24f67302b4c5ca1deed (diff) |
Merge branch '0.8.x' into userdesign
Conflicts:
lib/attachmentlist.php
lib/noticelist.php
Diffstat (limited to 'lib/router.php')
-rw-r--r-- | lib/router.php | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/router.php b/lib/router.php index 70ee0f3fb..fc119821b 100644 --- a/lib/router.php +++ b/lib/router.php @@ -153,24 +153,17 @@ class Router $m->connect('attachment/:attachment/ajax', array('action' => 'attachment_ajax'), - array('notice' => '[0-9]+')); - - $m->connect('attachment/:attachment', - array('action' => 'attachment'), - array('notice' => '[0-9]+')); + array('attachment' => '[0-9]+')); - // notice + $m->connect('attachment/:attachment/thumbnail', + array('action' => 'attachment_thumbnail'), + array('attachment' => '[0-9]+')); $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]+')); |