diff options
| author | Sarven Capadisli <csarven@csarven-laptop.(none)> | 2009-05-25 15:53:49 -0400 |
|---|---|---|
| committer | Sarven Capadisli <csarven@csarven-laptop.(none)> | 2009-05-25 15:53:49 -0400 |
| commit | 959dce823f105fa5bfbba42b6912b041085be325 (patch) | |
| tree | 6be8f197f746e7949e342a7cb05fca5d09c5fb62 /lib | |
| parent | 01dad5729827870d87f87118c336dcf2acc4af32 (diff) | |
| parent | 64d0767654d93de81a0779f04eb992c574bbdece (diff) | |
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/router.php | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/lib/router.php b/lib/router.php index d1e2970c5..fc119821b 100644 --- a/lib/router.php +++ b/lib/router.php @@ -151,10 +151,6 @@ class Router $m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'), array('q' => '.+')); -/* - $m->connect('attachment/ajax_by_url/*url', - array('action' => 'attachment_ajax')); -*/ $m->connect('attachment/:attachment/ajax', array('action' => 'attachment_ajax'), array('attachment' => '[0-9]+')); @@ -163,27 +159,11 @@ class Router array('action' => 'attachment_thumbnail'), array('attachment' => '[0-9]+')); -/* - TODO - not used right now, will revisit later - $m->connect('attachment/:attachment', - array('action' => 'attachment'), - array('attachment' => '[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]+')); |