summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-14 15:58:19 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-14 15:58:19 -0700
commitc2ba727d6154394fe234e9297b430ac69fd24c88 (patch)
tree7d8d787a46940cfaf9310bf8be4be67633099d8c /lib
parentdaf2e7ef47b6ed071e764858c4b1a9f5eaadb65d (diff)
parent203a5aba67c3bd9e2848d90b1778240b387aeda3 (diff)
Merge branch '0.7.x' into 0.8.x
Diffstat (limited to 'lib')
-rw-r--r--lib/router.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/router.php b/lib/router.php
index 456d1793e..5db401e74 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');
+ 'block', 'unblock', 'subedit');
foreach ($main as $a) {
$m->connect('main/'.$a, array('action' => $a));