Skip to content

Commit 32449bc

Browse files
Merge pull request #8321 from sbulen/30_ip_obj_key
2 parents 5cda44d + c4e9fe8 commit 32449bc

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

Sources/Actions/Admin/Members.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,16 +1519,16 @@ protected static function populateDuplicateMembers(array &$members): void
15191519
'name' => $row['member_name'],
15201520
'email' => $row['email_address'],
15211521
'is_banned' => $row['is_activated'] >= User::BANNED,
1522-
'ip' => $row['member_ip'],
1523-
'ip2' => $row['member_ip2'],
1522+
'ip' => (string) $row['member_ip'],
1523+
'ip2' => (string) $row['member_ip2'],
15241524
];
15251525

1526-
if (in_array($row['member_ip'], $ips)) {
1527-
$duplicate_members[$row['member_ip']][] = $member_context;
1526+
if (in_array((string) $row['member_ip'], $ips)) {
1527+
$duplicate_members[(string) $row['member_ip']][] = $member_context;
15281528
}
15291529

1530-
if ($row['member_ip'] != $row['member_ip2'] && in_array($row['member_ip2'], $ips)) {
1531-
$duplicate_members[$row['member_ip2']][] = $member_context;
1530+
if ((string) $row['member_ip'] != (string) $row['member_ip2'] && in_array((string) $row['member_ip2'], $ips)) {
1531+
$duplicate_members[(string) $row['member_ip2']][] = $member_context;
15321532
}
15331533
}
15341534
Db::$db->free_result($request);
@@ -1555,32 +1555,32 @@ protected static function populateDuplicateMembers(array &$members): void
15551555
$row['poster_ip'] = new IP($row['poster_ip']);
15561556

15571557
// Don't collect lots of the same.
1558-
if (isset($had_ips[$row['poster_ip']]) && in_array($row['id_member'], $had_ips[$row['poster_ip']])) {
1558+
if (isset($had_ips[(string) $row['poster_ip']]) && in_array((string) $row['id_member'], $had_ips[(string) $row['poster_ip']])) {
15591559
continue;
15601560
}
15611561

1562-
$had_ips[$row['poster_ip']][] = $row['id_member'];
1562+
$had_ips[(string) $row['poster_ip']][] = $row['id_member'];
15631563

1564-
$duplicate_members[$row['poster_ip']][] = [
1564+
$duplicate_members[(string) $row['poster_ip']][] = [
15651565
'id' => $row['id_member'],
15661566
'name' => $row['member_name'],
15671567
'email' => $row['email_address'],
15681568
'is_banned' => $row['is_activated'] >= User::BANNED,
1569-
'ip' => $row['poster_ip'],
1570-
'ip2' => $row['poster_ip'],
1569+
'ip' => (string) $row['poster_ip'],
1570+
'ip2' => (string) $row['poster_ip'],
15711571
];
15721572
}
15731573
Db::$db->free_result($request);
15741574

15751575
// Now we have all the duplicate members, stick them with their respective member in the list.
15761576
if (!empty($duplicate_members)) {
15771577
foreach ($members as $key => $member) {
1578-
if (isset($duplicate_members[$member['member_ip']])) {
1579-
$members[$key]['duplicate_members'] = $duplicate_members[$member['member_ip']];
1578+
if (isset($duplicate_members[(string) $member['member_ip']])) {
1579+
$members[$key]['duplicate_members'] = $duplicate_members[(string) $member['member_ip']];
15801580
}
15811581

1582-
if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[$member['member_ip2']])) {
1583-
$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[$member['member_ip2']]);
1582+
if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[(string) $member['member_ip2']])) {
1583+
$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[(string) $member['member_ip2']]);
15841584
}
15851585

15861586
// Check we don't have lots of the same member.

0 commit comments

Comments
 (0)