summaryrefslogtreecommitdiff
path: root/lib/router.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-14 15:59:35 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-14 15:59:35 -0700
commitbd26a80d45542c6b42f56ecf5472198f4600618b (patch)
tree907b778beb64f86285219276f2444c2626340f2f /lib/router.php
parent1c87532912b63effc047da2913e55a6551d8f629 (diff)
parentc2ba727d6154394fe234e9297b430ac69fd24c88 (diff)
Merge branch '0.8.x' into groupblock
Conflicts: lib/router.php
Diffstat (limited to 'lib/router.php')
-rw-r--r--lib/router.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/router.php b/lib/router.php
index 469d9a171..3d870e565 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -101,7 +101,7 @@ class Router
$main = array('login', 'logout', 'register', 'subscribe',
'unsubscribe', 'confirmaddress', 'recoverpassword',
'invite', 'favor', 'disfavor', 'sup',
- 'block', 'subedit', 'groupblock');
+ 'block', 'unblock', 'subedit', 'groupblock');
foreach ($main as $a) {
$m->connect('main/'.$a, array('action' => $a));