From e2716a23971e952d067bab664a8924c1b09c8995 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Mon, 24 Aug 2020 12:26:04 +0000
Subject: [PATCH] Bug 25033: (follow-up) Don't limit suggestions to branches if
 displaying by branch

In the case of organizing by branches we should not filter by branch
---
 suggestion/suggestion.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
index 48527ae363..bd4c1a0696 100755
--- a/suggestion/suggestion.pl
+++ b/suggestion/suggestion.pl
@@ -355,7 +355,7 @@ if ($op=~/else/) {
         }
         my $definedvalue = defined $$suggestion_ref{$displayby} && $$suggestion_ref{$displayby} ne "";
 
-        next if ( $definedvalue && $$suggestion_ref{$displayby} ne $criteriumvalue ) and ($displayby ne 'branchcode' or $branchfilter ne '__ANY__' );
+        next if ( $definedvalue && $$suggestion_ref{$displayby} ne $criteriumvalue ) and ($displayby ne 'branchcode' && $branchfilter ne '__ANY__' );
         $$suggestion_ref{$displayby} = $criteriumvalue;
 
         my $suggestions = &SearchSuggestion({ %$suggestion_ref, archived => $filter_archived });
-- 
2.11.0