Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts: classes/User.php
2010-12-06 12:44:19 -08:00
parent 89f5dd4c18 76f3dc32e0
commit 2617c40e04
3 changed files with 35 additions and 4 deletions
--- a/lib/router.php
+++ b/lib/router.php
@@ -798,8 +798,7 @@ class Router

            if (common_config('singleuser', 'enabled')) {

-                $user = User::singleUser();
-                $nickname = $user->nickname;
+                $nickname = User::singleUserNickname();

                foreach (array('subscriptions', 'subscribers',
                               'all', 'foaf', 'xrds',