Merge branch 'master' into 1.0.x

2010-08-13 14:33:41 -07:00
parent 9f0715a993 029aa0c61c
commit 7183175429
78 changed files with 11330 additions and 2668 deletions
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -141,7 +141,7 @@ class StatusNet
            return true;
        }

-        $sn = Status_network::staticGet($nickname);
+        $sn = Status_network::staticGet('nickname', $nickname);
        if (empty($sn)) {
            return false;
            throw new Exception("No such site nickname '$nickname'");