diff options
author | Jim Brandt <jbrandt@bestpractical.com> | 2022-07-13 16:28:34 +0300 |
---|---|---|
committer | Jim Brandt <jbrandt@bestpractical.com> | 2022-07-13 16:28:34 +0300 |
commit | 850147a97ac346582f659c19f8e082fb3e53ce22 (patch) | |
tree | 49f270db602d35961d7ce3332dc66ca3c2ac1457 | |
parent | 45c29dce558917cdd9960121f31f899698f75b69 (diff) | |
parent | 46d2659a3523ffc34880999c7b60d8ba164b9068 (diff) |
Merge branch '5.0/allow-empty-search-result-page' into 5.0.3-relengrt-5.0.3
-rw-r--r-- | lib/RT/Interface/Web.pm | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm index 79c3c7c60a..e31d629104 100644 --- a/lib/RT/Interface/Web.pm +++ b/lib/RT/Interface/Web.pm @@ -310,18 +310,16 @@ sub HandleRequest { local $HTML::Mason::Commands::DECODED_ARGS = $ARGS; PreprocessTimeUpdates($ARGS); - if ( exists $ARGS->{ResultPage} ) { + if ( defined $ARGS->{ResultPage} && length $ARGS->{ResultPage} ) { my $passed; - if ( defined $ARGS->{ResultPage} && length $ARGS->{ResultPage} ) { - for my $item ( @RT::Interface::Web::WHITELISTED_RESULT_PAGES ) { - if ( ref $item eq 'Regexp' ) { - $passed = 1 if $ARGS->{ResultPage} =~ $item; - } - else { - $passed = 1 if $ARGS->{ResultPage} eq $item; - } - last if $passed; + for my $item (@RT::Interface::Web::WHITELISTED_RESULT_PAGES) { + if ( ref $item eq 'Regexp' ) { + $passed = 1 if $ARGS->{ResultPage} =~ $item; + } + else { + $passed = 1 if $ARGS->{ResultPage} eq $item; } + last if $passed; } if ( !$passed ) { |