diff options
| author | Brion Vibber <brion@pobox.com> | 2010-12-06 12:44:19 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-12-06 12:44:19 -0800 |
| commit | 2617c40e048aee071b72b4b5f664fab36e6c632d (patch) | |
| tree | 3cf44db45e87eefe00a3e2de0993394dc6620986 /lib/router.php | |
| parent | 89f5dd4c182e470f063c760daf59b858cd92f9bf (diff) | |
| parent | 76f3dc32e0e1aa933931b7cc59030ae20bb4f89b (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
classes/User.php
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/router.php b/lib/router.php index a0ea996ec..8670519ff 100644 --- 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', |