eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fall back to siteowner on bad nickname (Bug#2861)

This commit is contained in:
Evan Prodromou 2010-10-28 10:46:57 -04:00
parent 22a0cf6251
commit b5206fe6ca
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classes/User.php
View File

@ -889,13 +889,23 @@ class User extends Memcached_DataObject
static function singleUser() static function singleUser()
{ {
if (common_config('singleuser', 'enabled')) { if (common_config('singleuser', 'enabled')) {
$user = null;
$nickname = common_config('singleuser', 'nickname'); $nickname = common_config('singleuser', 'nickname');
if ($nickname) {
if (!empty($nickname)) {
$user = User::staticGet('nickname', $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(); $user = User::siteOwner();
} }
if ($user) {
if (!empty($user)) {
return $user; return $user;
} else { } else {
// TRANS: Server exception. // TRANS: Server exception.