Skip to content

[3.0] Cast objs to string when used as keys #8321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sesquipedalian merged 3 commits into from
Nov 11, 2024
Merged

[3.0] Cast objs to string when used as keys #8321

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad1dc36
Use __toString for keys, not objs
sbulen Oct 9, 2024
179e10a
Use __toString() for keys, not objs
sbulen Nov 9, 2024
c4e9fe8
Cast to string when used as array key
sbulen Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions Sources/Actions/Admin/Members.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,16 +1519,16 @@ protected static function populateDuplicateMembers(array &$members): void
'name' => $row['member_name'],
'email' => $row['email_address'],
'is_banned' => $row['is_activated'] >= User::BANNED,
'ip' => $row['member_ip'],
'ip2' => $row['member_ip2'],
'ip' => (string) $row['member_ip'],
'ip2' => (string) $row['member_ip2'],
];

if (in_array($row['member_ip'], $ips)) {
$duplicate_members[$row['member_ip']][] = $member_context;
if (in_array((string) $row['member_ip'], $ips)) {
$duplicate_members[(string) $row['member_ip']][] = $member_context;
}

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

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

$had_ips[$row['poster_ip']][] = $row['id_member'];
$had_ips[(string) $row['poster_ip']][] = $row['id_member'];

$duplicate_members[$row['poster_ip']][] = [
$duplicate_members[(string) $row['poster_ip']][] = [
'id' => $row['id_member'],
'name' => $row['member_name'],
'email' => $row['email_address'],
'is_banned' => $row['is_activated'] >= User::BANNED,
'ip' => $row['poster_ip'],
'ip2' => $row['poster_ip'],
'ip' => (string) $row['poster_ip'],
'ip2' => (string) $row['poster_ip'],
];
}
Db::$db->free_result($request);

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

if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[$member['member_ip2']])) {
$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[$member['member_ip2']]);
if ($member['member_ip'] != $member['member_ip2'] && isset($duplicate_members[(string) $member['member_ip2']])) {
$members[$key]['duplicate_members'] = array_merge($member['duplicate_members'], $duplicate_members[(string) $member['member_ip2']]);
}

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