mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "https://github.com/librenms/librenms/issues/10686 (#10687)" (#10755)

Browse Source 
This reverts commit d3d34a7f4d.
This commit is contained in:
Tony Murray
2019-10-28 15:59:00 -07:00
committed by GitHub
parent 259c5294a1
commit 6b3d64e4c2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/html/print-map.inc.php
View File

@@ -286,9 +286,11 @@ foreach ($list as $items) {
$device_id1 = $items['local_device_id'].':'.$items['remote_device_id']; $device_id1 = $items['local_device_id'].':'.$items['remote_device_id'];
$device_id2 = $items['remote_device_id'].':'.$items['local_device_id']; $device_id2 = $items['remote_device_id'].':'.$items['local_device_id'];
// Ensure only one link exists between any two ports. // Ensure only one link exists between any two ports, or any two devices.
if (!array_key_exists($link_id1, $link_assoc_seen) && if (!array_key_exists($link_id1, $link_assoc_seen) &&
!array_key_exists($link_id2, $link_assoc_seen)) { !array_key_exists($link_id2, $link_assoc_seen) &&
!array_key_exists($device_id1, $device_assoc_seen) &&
!array_key_exists($device_id2, $device_assoc_seen)) {
$local_port = cleanPort($local_port); $local_port = cleanPort($local_port);
$remote_port = cleanPort($remote_port); $remote_port = cleanPort($remote_port);
$links[] = array_merge( $links[] = array_merge(