move some routes around to make more specific stuff first

diff --git a/lib/router.php b/lib/router.php
index 1647bfbb7c39e0957910603b670f007ad1b7bd59..fa34b17537f335e50b9c4ab21d73ff318e7ee58e 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -227,15 +227,17 @@ class Router
                         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' => Nickname::DISPLAY_FMT));
             $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
                         array('action' => 'newnotice'),
                         array('replyto' => Nickname::DISPLAY_FMT),
                         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',
                         array('action' => 'file'),
                         array('notice' => '[0-9]+'));
@@ -243,11 +245,13 @@ class Router
             $m->connect('notice/:notice',
                         array('action' => 'shownotice'),
                         array('notice' => '[0-9]+'));
-            $m->connect('notice/delete', array('action' => 'deletenotice'));
+
             $m->connect('notice/delete/:notice',
                         array('action' => 'deletenotice'),
                         array('notice' => '[0-9]+'));
 
+            $m->connect('notice/delete', array('action' => 'deletenotice'));
+
             $m->connect('bookmarklet/new', array('action' => 'bookmarklet'));
 
             // conversation