Merge branch '1.0.x' into people_tags_rebase

[quix0rs-gnu-social.git] / lib / router.php

diff --git a/lib/router.php b/lib/router.php
index 7f17f2d0a5145f683e398a47a781be60e842e8ab..5ee7fcc5c0966c89350b2e0aed2169fc3137bb1d 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -335,6 +335,9 @@ class Router
             $m->connect('conversation/:id',
                         array('action' => 'conversation'),
                         array('id' => '[0-9]+'));
+            $m->connect('conversation/:id/replies',
+                        array('action' => 'conversationreplies'),
+                        array('id' => '[0-9]+'));
 
             $m->connect('message/new', array('action' => 'newmessage'));
             $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => Nickname::DISPLAY_FMT));