X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FUser.php;h=7345dc7f94ad68aa31277d4a9a21ad4d0a21d00e;hb=fbd8052d05fda7a967d8440574d2b5013d4e7be1;hp=f381ec6070eeba6e1ea61d6bbb58e95a8126d859;hpb=07bc50eaedd262573bf1560b075670d803e17a63;p=quix0rs-gnu-social.git

diff --git a/classes/User.php b/classes/User.php
index f381ec6070..7345dc7f94 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -889,13 +889,23 @@ class User extends Memcached_DataObject
     static function singleUser()
     {
         if (common_config('singleuser', 'enabled')) {
+
+            $user = null;
+
             $nickname = common_config('singleuser', 'nickname');
-            if ($nickname) {
+
+            if (!empty($nickname)) {
                 $user = User::staticGet('nickname', $nickname);
-            } else {
+            }
+
+            // if there was no nickname or no user by that nickname,
+            // try the site owner.
+
+            if (empty($user)) {
                 $user = User::siteOwner();
             }
-            if ($user) {
+
+            if (!empty($user)) {
                 return $user;
             } else {
                 // TRANS: Server exception.