Merge branch '0.8.x' into groupblock

Conflicts: lib/router.php
2009-06-14 15:59:35 -07:00
parent 1c87532912 c2ba727d61
commit bd26a80d45
4 changed files with 9 additions and 5 deletions
--- 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));