diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-20 14:34:25 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-20 14:34:25 -0700 |
| commit | 8004e2809d98bdd535a3c59bd7d15c3fa2dd7ba9 (patch) | |
| tree | 177994041c35b5910d0227de6e64e8ff5c7667cc /lib/router.php | |
| parent | 75ebf3c34844dbba0eb229d0c7d0d618118ce1ab (diff) | |
Fix for ticket #2845: singleuser nickname configuration was being overridden by site owner in router setup.
I've consolidated the checks for which user to use for single-user mode into User::singleUser(), which now uses the configured nickname by preference, falling back to the site owner if it's unset.
This is now called consistently from the places that needed to use the primary user's nickname in routing setup.
Setting $config['singleuser']['nickname'] should now work again as expected.
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/router.php b/lib/router.php index b1cc8d529..8c682cefa 100644 --- a/lib/router.php +++ b/lib/router.php @@ -701,16 +701,8 @@ class Router if (common_config('singleuser', 'enabled')) { - $user = User::siteOwner(); - - if (!empty($user)) { - $nickname = $user->nickname; - } else { - $nickname = common_config('singleuser', 'nickname'); - if (empty($nickname)) { - throw new ServerException(_("No single user defined for single-user mode.")); - } - } + $user = User::singleUser(); + $nickname = $user->nickname; foreach (array('subscriptions', 'subscribers', 'all', 'foaf', 'xrds', |