From a3ba0ccc9367da640cd0e438c89fd62e4cef7916 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 29 Jul 2020 14:59:55 +0000 Subject: [PATCH] Simplified code --- src/Model/User.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Model/User.php b/src/Model/User.php index 7b88aac189..46f0776b4e 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -194,15 +194,13 @@ class User public static function getFirstAdmin(array $fields = []) { if (!empty(DI::config()->get('config', 'admin_nickname'))) { - $administrator = self::getByNickname(DI::config()->get('config', 'admin_nickname'), $fields); + return self::getByNickname(DI::config()->get('config', 'admin_nickname'), $fields); } elseif (!empty(DI::config()->get('config', 'admin_email'))) { $adminList = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email'))); - $administrator = self::getByEmail($adminList[0], $fields); + return self::getByEmail($adminList[0], $fields); + } else { + return []; } - if (!empty($administrator)) { - return $administrator; - } - return []; } /**