Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

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

diff --git a/lib/router.php b/lib/router.php
index faa26c8610e0eabf206feb3b0a4e62c14508567b..ef5fece137d31882ce4559b215c888720bcf2dc1 100644 (file)
--- 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]+'));