Merge branch '5.0/allow-empty-search-result-page' into 5.0.3-releng

bestpractical · Jul 13, 2022 · 850147a · 850147a
2 parents 45c29dc + 46d2659
commit 850147a
Showing 1 changed file with 8 additions and 10 deletions.
diff --git 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 ) {