Implemented WebFinger and replaced our XRD with PEAR XML_XRD

[quix0rs-gnu-social.git] / classes / User.php

diff --git a/classes/User.php b/classes/User.php
index 14ff66825aff2b5919c472009cd715730d0e5bdd..82545d4bb50ed04bb80bf22273fca7148ec56151 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -907,6 +907,10 @@ class User extends Managed_DataObject
             self::cacheSet('user:site_owner', $owner);
         }
 
+        if (!($owner instanceof User)) {
+            throw new ServerException(_('No site owner configured.'));
+        }
+
         return $owner;
     }
 
@@ -936,14 +940,13 @@ class User extends Managed_DataObject
             // try the site owner.
 
             if (empty($user)) {
-                $user = User::siteOwner();
-            }
-
-            if (!empty($user)) {
-                return $user;
-            } else {
-                // TRANS: Server exception.
-                throw new ServerException(_('No single user defined for single-user mode.'));
+                try {
+                    $user = User::siteOwner();
+                    return $user;
+                } catch (ServerException $e) {
+                    // TRANS: Server exception.
+                    throw new ServerException(_('No single user defined for single-user mode.'));
+                }
             }
         } else {
             // TRANS: Server exception.