GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

move some routes around to make more specific stuff first

Browse Source
This commit is contained in:
Evan Prodromou 2011-09-18 19:31:29 -04:00
parent 2c1911bfae
commit e2cc7f550a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/router.php
View File

@ -227,15 +227,17 @@ class Router
array('action' => 'attachment_thumbnail'), array('action' => 'attachment_thumbnail'),
array('attachment' => '[0-9]+')); array('attachment' => '[0-9]+'));
$m->connect('notice/new', array('action' => 'newnotice'));
$m->connect('notice/new?replyto=:replyto',
array('action' => 'newnotice'),
array('replyto' => Nickname::DISPLAY_FMT));
$m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto', $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
array('action' => 'newnotice'), array('action' => 'newnotice'),
array('replyto' => Nickname::DISPLAY_FMT), array('replyto' => Nickname::DISPLAY_FMT),
array('inreplyto' => '[0-9]+')); array('inreplyto' => '[0-9]+'));
$m->connect('notice/new?replyto=:replyto',
array('action' => 'newnotice'),
array('replyto' => Nickname::DISPLAY_FMT));
$m->connect('notice/new', array('action' => 'newnotice'));
$m->connect('notice/:notice/file', $m->connect('notice/:notice/file',
array('action' => 'file'), array('action' => 'file'),
array('notice' => '[0-9]+')); array('notice' => '[0-9]+'));
@ -243,11 +245,13 @@ class Router
$m->connect('notice/:notice', $m->connect('notice/:notice',
array('action' => 'shownotice'), array('action' => 'shownotice'),
array('notice' => '[0-9]+')); array('notice' => '[0-9]+'));
$m->connect('notice/delete', array('action' => 'deletenotice'));
$m->connect('notice/delete/:notice', $m->connect('notice/delete/:notice',
array('action' => 'deletenotice'), array('action' => 'deletenotice'),
array('notice' => '[0-9]+')); array('notice' => '[0-9]+'));
$m->connect('notice/delete', array('action' => 'deletenotice'));
$m->connect('bookmarklet/new', array('action' => 'bookmarklet')); $m->connect('bookmarklet/new', array('action' => 'bookmarklet'));
// conversation // conversation