diff options
| author | Evan Prodromou <evan@status.net> | 2009-09-23 09:45:22 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-09-23 09:45:22 -0400 |
| commit | 8284b3cb82f4dec6e0f2bf74dea6e1a3bc7f4eac (patch) | |
| tree | 09b8c466df2476f9219550464eb73f6ecaa54e1c /lib/router.php | |
| parent | 2cabfba767ba0d92d34a6ea4e4cf91c7325f3e95 (diff) | |
| parent | bef4a8b6ba9e19f2ec629031444279ca76f17bcf (diff) | |
Merge branch '0.8.x' into 0.9.x
Conflicts:
actions/requesttoken.php
classes/File.php
install.php
lib/noticeform.php
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/router.php b/lib/router.php index 2c4d63b0d..c18f273ed 100644 --- a/lib/router.php +++ b/lib/router.php @@ -172,6 +172,10 @@ class Router $m->connect('notice/new?replyto=:replyto', array('action' => 'newnotice'), array('replyto' => '[A-Za-z0-9_-]+')); + $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto', + array('action' => 'newnotice'), + array('replyto' => '[A-Za-z0-9_-]+'), + array('inreplyto' => '[0-9]+')); $m->connect('notice/:notice/file', array('action' => 'file'), |