Improved functionality to fetch the admin user

diff --git a/src/Model/User.php b/src/Model/User.php
index 0317edf9bf1c10159a53a72849318cd4c056b534..7b88aac1897dd93d6066f73ddedd67ea106bd267 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -193,17 +193,14 @@ class User
         */
        public static function getFirstAdmin(array $fields = [])
        {
-               $condition = [];
                if (!empty(DI::config()->get('config', 'admin_nickname'))) {
-                       $condition['nickname'] = DI::config()->get('config', 'admin_nickname');
-               }
-               if (!empty(DI::config()->get('config', 'admin_email'))) {
+                       $administrator = 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')));
-                       $condition['email'] = $adminList[0];
                        $administrator = self::getByEmail($adminList[0], $fields);
-                       if (!empty($administrator)) {
-                               return $administrator;
-                       }
+               }
+               if (!empty($administrator)) {
+                       return $administrator;
                }
                return [];
        }