summaryrefslogtreecommitdiff
path: root/lib/router.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-05-21 16:47:57 -0400
committerEvan Prodromou <evan@status.net>2010-05-21 16:47:57 -0400
commit6d8e01ad13dd9bc9e149f43a1eb88671d4737f4d (patch)
tree12f8b318971d1a1eebbb318e3c19142a56dce444 /lib/router.php
parent8a2144aeed2e338ef1b21425b9387086790aa820 (diff)
parentbbfd6eff0c69f038d151d3bf6c8bf9b45a64716f (diff)
Merge branch 'master' of gitorious.org:statusnet/mainline
Diffstat (limited to 'lib/router.php')
-rw-r--r--lib/router.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/router.php b/lib/router.php
index a9d07276f..afe44f92a 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -136,6 +136,11 @@ class Router
$m->connect('main/'.$a, array('action' => $a));
}
+ // Also need a block variant accepting ID on URL for mail links
+ $m->connect('main/block/:profileid',
+ array('action' => 'block'),
+ array('profileid' => '[0-9]+'));
+
$m->connect('main/sup/:seconds', array('action' => 'sup'),
array('seconds' => '[0-9]+'));