diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-26 17:28:12 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-26 17:28:12 -0400 |
| commit | 0b53a820c2b4224b66b2a24f67302b4c5ca1deed (patch) | |
| tree | 67086e31a9437327898920996bede11c1668f0e2 /lib/router.php | |
| parent | 40d4668c7c5cdd41d36b878ad87f7737117efc9c (diff) | |
| parent | c93031c2aa49b8a044e896ca1e07f5f4f429308e (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
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]+')); |