diff options
author | Craig Andrews <candrews@integralblue.com> | 2009-09-24 17:15:54 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2009-09-24 17:15:54 -0400 |
commit | 49bce941a9aae495ee7221bd367791227487b458 (patch) | |
tree | 91858ee586473045158f6bb539e26af8168ecd84 /lib/router.php | |
parent | 3d30ad83f881a69d76b57a9af051fef308644987 (diff) | |
parent | 5323956e388ebc2e4dfa1a5193aa670c96fff027 (diff) |
Merge remote branch 'statusnet/0.8.x' into 0.9.x
Conflicts:
EVENTS.txt
actions/requesttoken.php
classes/File.php
install.php
lib/action.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'), |