From 2a243b747d1bd34b880e1761b397738ce0b4de21 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 29 Jul 2020 14:55:55 +0000
Subject: [PATCH] Improved functionality to fetch the admin user

---
 src/Model/User.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Model/User.php b/src/Model/User.php
index 0317edf9bf..7b88aac189 100644
--- 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 [];
 	}