diff options
author | Brion Vibber <brion@pobox.com> | 2010-06-10 15:37:06 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-06-10 15:37:06 -0700 |
commit | b1a68e15b760aa2e588680c9e8c7526a7a6d1d13 (patch) | |
tree | 6100f1aa00f9930433f178173099c0ce67fdc502 /lib/router.php | |
parent | 7cc58b97feb822ab999b7fefa3a50ce53a7838d5 (diff) | |
parent | e121d472e7dbb914a85b10bde0a9e2add4d19d11 (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/default.php
lib/util.php
plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
Diffstat (limited to 'lib/router.php')
-rw-r--r-- | lib/router.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/router.php b/lib/router.php index faa26c861..ef5fece13 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]+')); |