From d191eed760cc1e8c6cc799b68afe59f7405ea986 Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Fri, 27 Dec 2019 19:40:54 +0100
Subject: [ticket/16273] Check whether the index exists in memberlist - PHP 7.4

PHPBB3-16273
---
 phpBB/memberlist.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 43b58969a5..e28e18beba 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -656,8 +656,8 @@ switch ($mode)
 
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
-		$foe = ($row['foe']) ? true : false;
-		$friend = ($row['friend']) ? true : false;
+		$foe = $row['foe'] ?? false;
+		$friend = $row['friend'] ?? false;
 		$db->sql_freeresult($result);
 
 		if ($config['load_onlinetrack'])
@@ -670,7 +670,7 @@ switch ($mode)
 			$db->sql_freeresult($result);
 
 			$member['session_time'] = (isset($row['session_time'])) ? $row['session_time'] : 0;
-			$member['session_viewonline'] = (isset($row['session_viewonline'])) ? $row['session_viewonline'] :	0;
+			$member['session_viewonline'] = (isset($row['session_viewonline'])) ? $row['session_viewonline'] : 0;
 			unset($row);
 		}
 
-- 
cgit v1.2.1


From ebf7e9f45f00bfff184980d7edd3efa765df1c4b Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Sat, 28 Dec 2019 01:47:12 +0100
Subject: [ticket/16273] Check whether the index exists in memberlist - PHP 7.4

Cast to bool

PHPBB3-16273
---
 phpBB/memberlist.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index e28e18beba..35c218cd8c 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -656,8 +656,8 @@ switch ($mode)
 
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);
-		$foe = $row['foe'] ?? false;
-		$friend = $row['friend'] ?? false;
+		$foe = (bool) $row['foe'] ?? false;
+		$friend = (bool) $row['friend'] ?? false;
 		$db->sql_freeresult($result);
 
 		if ($config['load_onlinetrack'])
-- 
cgit v1.2.1