Merge branch '1.0.x' into schema-x

Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po

1 files changed, 13 insertions, 3 deletions

diff --git a/classes/User.php b/classes/User.php
index 9188938b1..5914f0b80 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -884,13 +884,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.