Fix for ticket #2845: singleuser nickname configuration was being overridden by site...

[quix0rs-gnu-social.git] / lib / router.php

diff --git a/lib/router.php b/lib/router.php
index b1cc8d52941347bec09400c38c7affdba68a1ed2..8c682cefa905deaf4ec79d6d608d0000d17bc718 100644 (file)
--- 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',