merge 0.9.x into 1.0.x

2011-05-04 14:59:39 -07:00
parent 7e1ae44fad 753bc7302a
commit c97048d01b
13 changed files with 318 additions and 68 deletions
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -108,6 +108,8 @@ class StatusNet
     */
    public static function init($server=null, $path=null, $conffile=null)
    {
+        Router::clear();
+
        StatusNet::initDefaults($server, $path);
        StatusNet::loadConfigFile($conffile);