From c1799a8a05ae3a06cd14d232e8a673e2aebd45e3 Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Sat, 22 Feb 2014 08:41:32 +0000 Subject: [PATCH] workaround for https://rt.cpan.org/Ticket/Display.html?id=93244 --- Netdisco/Changes | 1 + Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Netdisco/Changes b/Netdisco/Changes index 2658233b..7cc003b7 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -9,6 +9,7 @@ [ENHANCEMENTS] * Kwalitee fixes + * workaround for https://rt.cpan.org/Ticket/Display.html?id=93244 2.023002 - 2014-02-17 diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm index 54832d2c..20e7d898 100644 --- a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm +++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm @@ -372,8 +372,8 @@ sub carrying_vlan { if ref {} ne ref $cond or !exists $cond->{vlan}; $cond->{'-and'} ||= []; - push @{$cond->{'-and'}}, 'vlans.vlan' => $cond->{vlan}; - push @{$cond->{'-and'}}, 'port_vlans.vlan' => delete $cond->{vlan}; + push @{$cond->{'-and'}}, { 'vlans.vlan' => $cond->{vlan} }; + push @{$cond->{'-and'}}, { 'port_vlans.vlan' => delete $cond->{vlan} }; return $rs ->search_rs($cond,