Merge branch '0.9.x' into 1.0.x

This commit is contained in:
Brion Vibber
2010-10-28 16:26:34 -07:00
958 changed files with 20496 additions and 13020 deletions

View File

@@ -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.